Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
2 build.properties
@@ -42,5 +42,5 @@ tomcat.context=/voldemort
javac.version=1.5
## Release
-curr.release=1.4.6
+curr.release=1.5.1
View
BIN lib/je-4.1.17.jar
Binary file not shown.
View
BIN lib/je-5.0.73.jar
Binary file not shown.
View
8 release_notes.txt
@@ -1,3 +1,11 @@
+Release 1.5.1 on 09/05/2013
+This is a custom release atop master (tag: release-1.5.1-cutoff),
+which simply upgrades BDB-JE to 5.0.73. Will be merged to master soon after canarying
+
+NOTE: Other changes need to noted in this file, at the time of the next non
+custom release off master.
+
+
Release 1.4.6 on 07/24/2013
Changes
View
39 src/java/voldemort/server/VoldemortConfig.java
@@ -93,6 +93,8 @@
private String bdbDataDirectory;
private long bdbMaxLogFileSize;
private int bdbBtreeFanout;
+ private int bdbMaxDelta;
+ private int bdbBinDelta;
private long bdbCheckpointBytes;
private long bdbCheckpointMs;
private boolean bdbOneEnvPerStore;
@@ -265,6 +267,8 @@ public VoldemortConfig(Props props) {
+ File.separator + "bdb");
this.bdbMaxLogFileSize = props.getBytes("bdb.max.logfile.size", 60 * 1024 * 1024);
this.bdbBtreeFanout = props.getInt("bdb.btree.fanout", 512);
+ this.bdbMaxDelta = props.getInt("bdb.max.delta", 100);
+ this.bdbBinDelta = props.getInt("bdb.bin.delta", 75);
this.bdbCheckpointBytes = props.getLong("bdb.checkpoint.interval.bytes", 200 * 1024 * 1024);
this.bdbCheckpointMs = props.getLong("bdb.checkpoint.interval.ms", 30 * Time.MS_PER_SECOND);
this.bdbOneEnvPerStore = props.getBoolean("bdb.one.env.per.store", false);
@@ -1071,6 +1075,41 @@ public void setBdbBtreeFanout(int bdbBtreeFanout) {
this.bdbBtreeFanout = bdbBtreeFanout;
}
+
+ /**
+ * Exposes BDB JE EnvironmentConfig.TREE_MAX_DELTA.
+ *
+ * <ul>
+ * <li>Property : "bdb.max.delta"</li>
+ * <li>Default : 100</li>
+ * </ul>
+ *
+ */
+ public void setBdbMaxDelta(int maxDelta) {
+ this.bdbMaxDelta = maxDelta;
+ }
+
+ public int getBdbMaxDelta() {
+ return this.bdbMaxDelta;
+ }
+
+ /**
+ * Exposes BDB JE EnvironmentConfig.TREE_BIN_DELTA.
+ *
+ * <ul>
+ * <li>Property : "bdb.bin.delta"</li>
+ * <li>Default : 75</li>
+ * </ul>
+ *
+ */
+ public void setBdbBinDelta(int binDelta) {
+ this.bdbBinDelta = binDelta;
+ }
+
+ public int getBdbBinDelta() {
+ return this.bdbBinDelta;
+ }
+
public boolean getBdbCleanerFetchObsoleteSize() {
return bdbCleanerFetchObsoleteSize;
}
View
4 src/java/voldemort/store/bdb/BdbStorageConfiguration.java
@@ -119,6 +119,10 @@ public BdbStorageConfiguration(VoldemortConfig config) {
environmentConfig.setConfigParam(EnvironmentConfig.CLEANER_FETCH_OBSOLETE_SIZE,
Boolean.toString(config.getBdbCleanerFetchObsoleteSize()));
environmentConfig.setLockTimeout(config.getBdbLockTimeoutMs(), TimeUnit.MILLISECONDS);
+ environmentConfig.setConfigParam(EnvironmentConfig.TREE_MAX_DELTA,
+ Integer.toString(config.getBdbMaxDelta()));
+ environmentConfig.setConfigParam(EnvironmentConfig.TREE_BIN_DELTA,
+ Integer.toString(config.getBdbBinDelta()));
if(config.getBdbCacheModeEvictLN()) {
environmentConfig.setCacheMode(CacheMode.EVICT_LN);
}

No commit comments for this range

Something went wrong with that request. Please try again.