Author: toad
Date: 2007-03-30 20:20:30 +0000 (Fri, 30 Mar 2007)
New Revision: 12455
Modified:
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Tell user why we are taking all this time.
Reconstruct secondary for block nums also.
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-30
19:44:27 UTC (rev 12454)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-30
20:20:30 UTC (rev 12455)
@@ -497,8 +497,10 @@
try {
atime = environment.openSecondaryDatabase
(null,
prefix+"CHK_accessTime", chkDB, secDbConfig);
- if(atime.count() < chkDB.count())
+ if(atime.count() < chkDB.count()) {
+ System.err.println("Access times database:
"+atime.count()+" but main database: "+chkDB.count());
throw new DatabaseException("Needs
repopulation");
+ }
} catch (DatabaseException e) {
WrapperManager.signalStarting((int)(Math.min(Integer.MAX_VALUE,
5*60*1000+chkDB.count()*100)));
// Of course it's not a solution but a quick fix
@@ -540,6 +542,10 @@
System.err.println("Opening block db index");
blockNums = environment.openSecondaryDatabase
(null, prefix+"CHK_blockNum", chkDB,
blockNoDbConfig);
+ if(blockNums.count() < chkDB.count()) {
+ System.err.println("Block nums database:
"+atime.count()+" but main database: "+chkDB.count());
+ throw new DatabaseException("Needs
repopulation");
+ }
} catch (DatabaseException e) {
WrapperManager.signalStarting((int)(Math.min(Integer.MAX_VALUE,
5*60*1000+chkDB.count()*100)));
// Of course it's not a solution but a quick fix
