Fix peer lookup reliability in Kademlia

Peergos · Apr 3, 2024 · 96d35a9 · 96d35a9
1 parent b4b3c96
commit 96d35a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/org/peergos/EmbeddedIpfs.java b/src/main/java/org/peergos/EmbeddedIpfs.java
@@ -146,6 +146,8 @@ public void start() {
         IdentifyBuilder.addIdentifyProtocol(node);
         LOG.info("Node started and listening on " + node.listenAddresses());
         LOG.info("Bootstrapping IPFS routing table");
+        if (bootstrap.isEmpty())
+            LOG.warning("Starting with empty bootstrap list - you will not join the global dht");
         int connections = dht.bootstrapRoutingTable(node, bootstrap, addr -> !addr.contains("/wss/"));
         LOG.info("Bootstrapping IPFS kademlia");
         dht.bootstrap(node);

diff --git a/src/main/java/org/peergos/protocol/dht/Kademlia.java b/src/main/java/org/peergos/protocol/dht/Kademlia.java
@@ -155,7 +155,7 @@ public List<PeerAddresses> findClosestPeers(byte[] key, int maxCount, Host us) {
         Id keyId = Id.create(Hash.sha256(key), 256);
         SortedSet<RoutingEntry> closest = Collections.synchronizedSortedSet(new TreeSet<>((a, b) -> compareKeys(a, b, keyId)));
         SortedSet<RoutingEntry> toQuery = Collections.synchronizedSortedSet(new TreeSet<>((a, b) -> compareKeys(a, b, keyId)));
-        List<PeerAddresses> localClosest = engine.getKClosestPeers(key, maxCount);
+        List<PeerAddresses> localClosest = engine.getKClosestPeers(key, Math.max(6, maxCount));
         if (maxCount == 1) {
             Optional<PeerAddresses> match = localClosest.stream().filter(p -> Arrays.equals(p.peerId.toBytes(), key)).findFirst();
             if (match.isPresent())