echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NetDb: Fix to set netDb ready immediately after reseed

Browse Source
This commit is contained in:
zzz
2019-06-05 17:37:23 +00:00
parent 4bd0f06cd6
commit c01bf47c8a
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
View File

@ -343,6 +343,7 @@ public class PersistentDataStore extends TransientDataStore {
private class ReadJob extends JobImpl { private class ReadJob extends JobImpl {
private volatile long _lastModified; private volatile long _lastModified;
private volatile long _lastReseed; private volatile long _lastReseed;
private volatile boolean _setNetDbReady;
private static final int MIN_ROUTERS = KademliaNetworkDatabaseFacade.MIN_RESEED; private static final int MIN_ROUTERS = KademliaNetworkDatabaseFacade.MIN_RESEED;
private static final long MIN_RESEED_INTERVAL = 90*60*1000; private static final long MIN_RESEED_INTERVAL = 90*60*1000;
@ -457,6 +458,7 @@ public class PersistentDataStore extends TransientDataStore {
_lastReseed = _context.clock().now(); _lastReseed = _context.clock().now();
// checkReseed will call wakeup() when done and we will run again // checkReseed will call wakeup() when done and we will run again
} else { } else {
_setNetDbReady = true;
_context.router().setNetDbReady(); _context.router().setNetDbReady();
} }
} else if (_lastReseed < _context.clock().now() - MIN_RESEED_INTERVAL) { } else if (_lastReseed < _context.clock().now() - MIN_RESEED_INTERVAL) {
@ -466,7 +468,19 @@ public class PersistentDataStore extends TransientDataStore {
_lastReseed = _context.clock().now(); _lastReseed = _context.clock().now();
// checkReseed will call wakeup() when done and we will run again // checkReseed will call wakeup() when done and we will run again
} else { } else {
_context.router().setNetDbReady(); if (!_setNetDbReady) {
_setNetDbReady = true;
_context.router().setNetDbReady();
}
}
} else {
// second time through, reseed called wakeup()
if (!_setNetDbReady) {
int count = Math.min(routerCount, size());
if (count >= MIN_ROUTERS) {
_setNetDbReady = true;
_context.router().setNetDbReady();
}
} }
} }
} }