Stop kademlia bootstrap thread when node is stopped

Peergos · Mar 13, 2024 · e7452b8 · e7452b8
1 parent 7bc1975
commit e7452b8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/org/peergos/EmbeddedIpfs.java b/src/main/java/org/peergos/EmbeddedIpfs.java
@@ -160,6 +160,7 @@ public CompletableFuture<Void> stop() throws Exception {
             records.close();
         }
         blockProvider.ifPresent(b -> b.stop());
+        dht.stopBootstrapThread();
         return node != null ? node.stop() : CompletableFuture.completedFuture(null);
     }
 

diff --git a/src/main/java/org/peergos/protocol/dht/Kademlia.java b/src/main/java/org/peergos/protocol/dht/Kademlia.java
@@ -18,6 +18,7 @@
 import java.time.*;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
 import java.util.function.*;
 import java.util.logging.*;
 import java.util.stream.*;
@@ -73,9 +74,11 @@ public int bootstrapRoutingTable(Host host, List<MultiAddress> addrs, Predicate<
         return successes;
     }
 
+    private AtomicBoolean running = new AtomicBoolean(false);
     public void startBootstrapThread(Host us) {
+        running.set(true);
         new Thread(() -> {
-            while (true) {
+            while (running.get()) {
                 try {
                     bootstrap(us);
                     Thread.sleep(BOOTSTRAP_PERIOD_MILLIS);
@@ -86,6 +89,10 @@ public void startBootstrapThread(Host us) {
         }, "Kademlia bootstrap").start();
     }
 
+    public void stopBootstrapThread() {
+        running.set(false);
+    }
+
     private boolean connectTo(Host us, PeerAddresses peer) {
         try {
             new Identify().dial(us, PeerId.fromBase58(peer.peerId.toBase58()), getPublic(peer)).getController().join().id().join();