[freenet-cvs] r20476 - branches/saltedhashstore/freenet/src/freenet/store

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-06-19 10:51:48 +0000 (Thu, 19 Jun 2008)
New Revision: 20476

Modified:
   
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
Log:
More time for store migration


Modified: 
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
===================================================================
--- 
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java  
    2008-06-19 10:51:24 UTC (rev 20475)
+++ 
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java  
    2008-06-19 10:51:48 UTC (rev 20476)
@@ -1399,11 +1399,12 @@
                        byte[] key = new byte[fullKeyLength];

                        long maxKey = storeRAF.length() / (headerBlockLength + 
dataBlockLength);
-
-                       WrapperManager.signalStarting((int) (Math.min(7 * 24 * 
60 * 60 * 1000, 5 * 60 * 1000L + maxKey * 100L)));
-                       for (int l = 0; true; l++) {
-                               if (l % 1024 == 0)
+                       
+                       for (int l = 0; l < maxKey; l++) {
+                               if (l % 1024 == 0) {
                                        System.out.println(" migrating key " + 
l + "/" + maxKey);
+                                       WrapperManager.signalStarting(10 * 60 * 
1000); // max 10 minutes for every 1024 keys  
+                               }

                                boolean keyRead = false;
                                storeRAF.readFully(header);