Author: toad
Date: 2008-11-29 22:48:23 +0000 (Sat, 29 Nov 2008)
New Revision: 23991
Modified:
trunk/freenet/src/freenet/node/Node.java
Log:
Keep the bloom filter size as -1 if it is -1. If we change the store size we
MUST change the bloom filter size too!
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-11-29 20:45:18 UTC (rev
23990)
+++ trunk/freenet/src/freenet/node/Node.java 2008-11-29 22:48:23 UTC (rev
23991)
@@ -1540,8 +1540,6 @@
});
storeBloomFilterSize =
nodeConfig.getInt("storeBloomFilterSize");
- if (storeBloomFilterSize == -1)
- storeBloomFilterSize = (int)
Math.min(maxTotalDatastoreSize / 2048, Integer.MAX_VALUE);
nodeConfig.register("storeBloomFilterCounting", true,
sortOrder++, true, false,
"Node.storeBloomFilterCounting",
"Node.storeBloomFilterCountingLong", new BooleanCallback() {
@@ -1897,6 +1895,9 @@
storeEnvironment = null;
envMutableConfig = null;
try {
+ long bloomSize = storeBloomFilterSize;
+ if (bloomSize == -1)
+ bloomSize = (int)
Math.min(maxTotalDatastoreSize / 2048, Integer.MAX_VALUE);
int bloomFilterSizeInM = storeBloomFilterCounting ?
storeBloomFilterSize / 6 * 4
: (storeBloomFilterSize + 6) / 6 * 8; // + 6 to
make size different, trigger rebuild
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
