Changeset c01bf47

Timestamp:

Jun 5, 2019 5:37:23 PM (10 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

6d72aee

Parents:

4bd0f06

Message:

NetDb?: Fix to set netDb ready immediately after reseed

File:

• router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java (modified) (3 diffs)

router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java

@@ -344 +344 @@
         private volatile long _lastModified;
         private volatile long _lastReseed;
+        private volatile boolean _setNetDbReady;
         private static final int MIN_ROUTERS = KademliaNetworkDatabaseFacade.MIN_RESEED;
         private static final long MIN_RESEED_INTERVAL = 90*60*1000;
@@ -458 +459 @@
                     // checkReseed will call wakeup() when done and we will run again
                 } else {
+                    _setNetDbReady = true;
                     _context.router().setNetDbReady();
                 }
@@ -467 +469 @@
                         // checkReseed will call wakeup() when done and we will run again
                 } 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();
+                    }
                 }
             }