From be0e008bc135a329f301cb8e05527fe201ddc0ad Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Mon, 19 Oct 2015 16:14:29 +0000
Subject: [PATCH] OPENDJ-2362 Use je.cleaner.minUtilization instead of je.cleaner.minFileUtilization
---
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml | 23 +++++++++++------------
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java | 2 +-
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JEBackendConfiguration.xml | 23 +++++++++++------------
4 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JEBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JEBackendConfiguration.xml
index eea1d16..9a9397c 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JEBackendConfiguration.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JEBackendConfiguration.xml
@@ -198,14 +198,13 @@
</adm:property>
<adm:property name="db-cleaner-min-utilization" advanced="true">
<adm:synopsis>
- Specifies the minimum percentage of "live" data that the database
- cleaner attempts to keep in database log files.
+ Specifies the occupancy percentage for "live" data in this backend's
+ database.
</adm:synopsis>
<adm:description>
- If the amount of live data in any database log file drops below
- this percentage, then the cleaner moves the remaining live
- data in that file to the end of the database and deletes the
- original file in order to keep the database relatively compact.
+ When the amount of "live" data in the database drops below this value,
+ cleaners will act to increase the occupancy percentage by compacting
+ the database.
</adm:description>
<adm:default-behavior>
<adm:defined>
@@ -223,15 +222,15 @@
</adm:property>
<adm:property name="db-run-cleaner" advanced="true">
<adm:synopsis>
- Indicates whether the database cleaner threads should be
- enabled.
+ Indicates whether the cleaner threads should be enabled to compact
+ the database.
</adm:synopsis>
<adm:description>
The cleaner threads are used to periodically compact the
- database by identifying database files with a low (that is, less than
- the amount specified by the db-cleaner-min-utilization property)
- percentage of live data, moving the remaining live data to the end
- of the log and deleting that file.
+ database when it reaches a percentage of occupancy lower than the
+ amount specified by the db-cleaner-min-utilization property. They identify
+ database files with a low percentage of live data, and relocate their
+ remaining live data to the end of the log.
</adm:description>
<adm:default-behavior>
<adm:defined>
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml
index 33fd17d..b965677 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml
@@ -464,14 +464,13 @@
</adm:property>
<adm:property name="db-cleaner-min-utilization" advanced="true">
<adm:synopsis>
- Specifies the minimum percentage of "live" data that the database
- cleaner attempts to keep in database log files.
+ Specifies the occupancy percentage for "live" data in this backend's
+ database.
</adm:synopsis>
<adm:description>
- If the amount of live data in any database log file drops below
- this percentage, then the cleaner moves the remaining live
- data in that file to the end of the database and deletes the
- original file in order to keep the database relatively compact.
+ When the amount of "live" data in the database drops below this value,
+ cleaners will act to increase the occupancy percentage by compacting
+ the database.
</adm:description>
<adm:default-behavior>
<adm:defined>
@@ -489,15 +488,15 @@
</adm:property>
<adm:property name="db-run-cleaner" advanced="true">
<adm:synopsis>
- Indicates whether the database cleaner threads should be
- enabled.
+ Indicates whether the cleaner threads should be enabled to compact
+ the database.
</adm:synopsis>
<adm:description>
The cleaner threads are used to periodically compact the
- database by identifying database files with a low (that is, less than
- the amount specified by the db-cleaner-min-utilization property)
- percentage of live data, moving the remaining live data to the end
- of the log and deleting that file.
+ database when it reaches a percentage of occupancy lower than the
+ amount specified by the db-cleaner-min-utilization property. They identify
+ database files with a low percentage of live data, and relocate their
+ remaining live data to the end of the log.
</adm:description>
<adm:default-behavior>
<adm:defined>
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
index b244f5b..c222569 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
@@ -810,7 +810,7 @@
envConfig.setDurability(Durability.COMMIT_NO_SYNC);
envConfig.setLockTimeout(0, TimeUnit.SECONDS);
envConfig.setTxnTimeout(0, TimeUnit.SECONDS);
- envConfig.setConfigParam(CLEANER_MIN_FILE_UTILIZATION,
+ envConfig.setConfigParam(CLEANER_MIN_UTILIZATION,
String.valueOf(cfg.getDBCleanerMinUtilization()));
envConfig.setConfigParam(LOG_FILE_MAX,
String.valueOf(cfg.getDBLogFileMax()));
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
index d8ca53d..69314d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
@@ -630,7 +630,7 @@
.setLockTimeout(0, TimeUnit.SECONDS)
.setTxnTimeout(0, TimeUnit.SECONDS)
.setDurability(Durability.COMMIT_NO_SYNC)
- .setConfigParam(CLEANER_MIN_FILE_UTILIZATION, String.valueOf(config.getDBCleanerMinUtilization()))
+ .setConfigParam(CLEANER_MIN_UTILIZATION, String.valueOf(config.getDBCleanerMinUtilization()))
.setConfigParam(LOG_FILE_MAX, String.valueOf(config.getDBLogFileMax()));
}
else
--
Gitblit v1.10.0