Improve publish quality

This slows down publishing to 11s (a large fraction of closest nodes may be quic only, so we need to try next closest)
Peergos · Dec 13, 2023 · 8b86b55 · 8b86b55
1 parent c8bef93
commit 8b86b55
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/main/java/org/peergos/protocol/dht/Kademlia.java b/src/main/java/org/peergos/protocol/dht/Kademlia.java
@@ -385,8 +385,30 @@ public CompletableFuture<Void> publishValue(PrivKey priv,
             // exit early if we have enough results
             if (publishes.size() >= minPublishes)
                 break;
-            if (toQuery.size() == remaining)
+            if (toQuery.size() == remaining) {
+                // publish to closest remaining nodes
+                while (publishes.size() < minPublishes) {
+                    List<RoutingEntry> closest = toQuery.stream()
+                    .limit(minPublishes - publishes.size() + 5)
+                    .collect(Collectors.toList());
+                    List<? extends Future<?>> lastFutures = closest.stream()
+                            .map(r -> {
+                                toQuery.remove(r);
+                                queried.add(r.addresses.peerId);
+                                return ioExec.submit(() -> {
+                                    if (putValue(priv, publisher, publishValue, sequence, expiry, ttlNanos, r.addresses, us))
+                                        publishes.add(r.addresses.peerId);
+                                });
+                            })
+                            .collect(Collectors.toList());
+                    lastFutures.forEach(f -> {
+                        try {
+                            f.get();
+                        } catch (Exception e) {}
+                    });
+                }
                 break;
+            }
         }
         return CompletableFuture.completedFuture(null);
     }

diff --git a/src/test/java/org/peergos/KademliaTest.java b/src/test/java/org/peergos/KademliaTest.java
@@ -87,7 +87,7 @@ public void ipnsBenchmark() throws Exception {
 
             List<PrivKey> signers = new ArrayList<>();
             long publishTotal = 0, resolveTotal = 0;
-            int iterations = 5;
+            int iterations = 25;
             for (int i = 0; i < iterations; i++) {
                 // publish mapping from node 1
                 PrivKey signer = Ed25519Kt.generateEd25519KeyPair().getFirst();