Merge pull request #5041 from chimp1984/request-only-not-seeds-if-no-…

…seed-available Request only non-seed nodes if no seed nodes are available
bisq-network · Jan 4, 2021 · 4da1bb0 · 4da1bb0
2 parents bf7a528 + a2d6b52
commit 4da1bb0
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataManager.java b/p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataManager.java
@@ -375,7 +375,7 @@ public void onFault(String errorMessage, @Nullable Connection connection) {
                                             listener.onNoPeersAvailable();
                                     }
 
-                                    restart();
+                                    requestFromNonSeedNodePeers();
                                 } else {
                                     log.info("We could not connect to seed node {} but we have other connection attempts open.", nodeAddress.getFullAddress());
                                 }
@@ -405,6 +405,18 @@ public void onFault(String errorMessage, @Nullable Connection connection) {
     // Utils
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    private void requestFromNonSeedNodePeers() {
+        List<NodeAddress> list = getFilteredNonSeedNodeList(getSortedNodeAddresses(peerManager.getReportedPeers()), new ArrayList<>());
+        List<NodeAddress> filteredPersistedPeers = getFilteredNonSeedNodeList(getSortedNodeAddresses(peerManager.getPersistedPeers()), list);
+        list.addAll(filteredPersistedPeers);
+
+        if (!list.isEmpty()) {
+            NodeAddress nextCandidate = list.get(0);
+            list.remove(nextCandidate);
+            requestData(nextCandidate, list);
+        }
+    }
+
     private void restart() {
         if (retryTimer == null) {
             retryTimer = UserThread.runAfter(() -> {