[freenet-cvs] r21028 - branches/saltedhashstore/freenet/src/freenet/store/saltedhash

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-07-10 13:10:45 +0000 (Thu, 10 Jul 2008)
New Revision: 21028

Modified:
   
branches/saltedhashstore/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
Log:
migrate all old data file before start

Modified: 
branches/saltedhashstore/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
===================================================================
--- 
branches/saltedhashstore/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
   2008-07-10 12:43:34 UTC (rev 21027)
+++ 
branches/saltedhashstore/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
   2008-07-10 13:10:45 UTC (rev 21028)
@@ -135,6 +135,12 @@
                shutdownHook.addEarlyJob(new Thread(new ShutdownDB()));

                cleanerThread = new Cleaner();
+
+               if (cleanerGlobalLock.tryLock()) {
+                       migrateFromOldSaltedHash(); // XXX Old Format, to be 
removed in next build
+                       cleanerGlobalLock.unlock();
+               }
+               
                cleanerThread.start();
        }

@@ -885,10 +891,6 @@
                                                Logger.debug(this, 
"interrupted", e);
                                        }

-                                       if (cleanerGlobalLock.tryLock()) {
-                                               migrateFromOldSaltedHash(); // 
XXX Old Format, to be removed in next build
-                                               cleanerGlobalLock.unlock();
-                                       }

                                        long _prevStoreSize;
                                        configLock.readLock().lock();
@@ -1501,6 +1503,7 @@
                                byte[] b = new byte[(int) entryTotalLength];

                                while (!shutdown) {
+                                       WrapperManager.signalStarting(10 * 60 * 
1000); // max 10 minutes
                                        int status = storeRAF.read(b);
                                        if (status != entryTotalLength)
                                                break;