Merge pull request #4648 from wubin01/k-bucket-optimize

net: optimize the k-bucket data structure

Author: xxo1shine

framework/src/main/java/org/tron/common/overlay/client/PeerClient.java

@@ -45,22 +45,27 @@ public void connect(String host, int port, String remoteId) {
       ChannelFuture f = connectAsync(host, port, remoteId, false);
       f.sync().channel().closeFuture().sync();
     } catch (Exception e) {
-      logger.info("Can't connect to {}:{}, cause:{})", host, port, e.getMessage());
+      logger.warn("Can't connect to {}:{}, cause:{})", host, port, e.getMessage());
     }
   }
 
-  public ChannelFuture connectAsync(NodeHandler nodeHandler, boolean discoveryMode) {
+  public void connectAsync(NodeHandler nodeHandler, boolean discoveryMode) {
     Node node = nodeHandler.getNode();
-    return connectAsync(node.getHost(), node.getPort(), node.getHexId(), discoveryMode)
-        .addListener((ChannelFutureListener) future -> {
-          if (!future.isSuccess()) {
-            logger.warn("Connect to {}:{} fail, cause:{}", node.getHost(), node.getPort(),
-                future.cause().getMessage());
-            nodeHandler.getNodeStatistics().nodeDisconnectedLocal(ReasonCode.CONNECT_FAIL);
-            nodeHandler.getNodeStatistics().notifyDisconnect();
-            future.channel().close();
-          }
-        });
+    try {
+      connectAsync(node.getHost(), node.getPort(), node.getHexId(), discoveryMode)
+              .addListener((ChannelFutureListener) future -> {
+                if (!future.isSuccess()) {
+                  logger.warn("Connect to {}:{} fail, cause:{}", node.getHost(), node.getPort(),
+                          future.cause().getMessage());
+                  nodeHandler.getNodeStatistics().nodeDisconnectedLocal(ReasonCode.CONNECT_FAIL);
+                  nodeHandler.getNodeStatistics().notifyDisconnect();
+                  future.channel().close();
+                }
+              });
+    } catch (Exception e) {
+      logger.warn("Connect to peer {} failed, reason: {}",
+              node.getHost(), e.getMessage());
+    }
   }
 
   private ChannelFuture connectAsync(String host, int port, String remoteId,

framework/src/main/java/org/tron/common/overlay/discover/table/NodeTable.java

@@ -20,7 +20,10 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.overlay.discover.node.Node;
 
@@ -29,7 +32,7 @@ public class NodeTable {
 
   private final Node node;  // our node
   private transient NodeBucket[] buckets;
-  private transient List<NodeEntry> nodes;
+  private transient Map<String, NodeEntry> nodes;
 
   public NodeTable(Node n) {
     this.node = n;
@@ -41,15 +44,19 @@ public Node getNode() {
   }
 
   public final void initialize() {
-    nodes = new ArrayList<>();
+    nodes = new HashMap<>();
     buckets = new NodeBucket[KademliaOptions.BINS];
     for (int i = 0; i < KademliaOptions.BINS; i++) {
       buckets[i] = new NodeBucket(i);
     }
   }
 
   public synchronized Node addNode(Node n) {
-    NodeEntry entry = getNodeEntry(n);
+    if (n.getHost().equals(node.getHost())) {
+      return null;
+    }
+
+    NodeEntry entry = nodes.get(n.getHost());
     if (entry != null) {
       entry.touch();
       return null;
@@ -60,24 +67,24 @@ public synchronized Node addNode(Node n) {
     if (lastSeen != null) {
       return lastSeen.getNode();
     }
-    nodes.add(e);
+    nodes.put(n.getHost(), e);
     return null;
   }
 
   public synchronized void dropNode(Node n) {
-    NodeEntry entry = getNodeEntry(n);
+    NodeEntry entry = nodes.get(n.getHost());
     if (entry != null) {
-      nodes.remove(entry);
+      nodes.remove(n.getHost());
       buckets[getBucketId(entry)].dropNode(entry);
     }
   }
 
   public synchronized boolean contains(Node n) {
-    return getNodeEntry(n) != null;
+    return nodes.containsKey(n.getHost());
   }
 
   public synchronized void touchNode(Node n) {
-    NodeEntry entry = getNodeEntry(n);
+    NodeEntry entry = nodes.get(n.getHost());
     if (entry != null) {
       entry.touch();
     }
@@ -103,9 +110,7 @@ public synchronized int getNodesCount() {
   }
 
   public synchronized List<NodeEntry> getAllNodes() {
-    List<NodeEntry> list = new ArrayList<>(nodes);
-    list.remove(new NodeEntry(node.getId(), node));
-    return list;
+    return new ArrayList<>(nodes.values());
   }
 
   public synchronized List<Node> getClosestNodes(byte[] targetId) {
@@ -123,14 +128,4 @@ public synchronized List<Node> getClosestNodes(byte[] targetId) {
     return closestNodes;
   }
 
-  private NodeEntry getNodeEntry(Node n) {
-    NodeEntry entry = null;
-    for (NodeEntry e: nodes) {
-      if (e.getNode().getHost().equals(n.getHost())) {
-        entry = e;
-        break;
-      }
-    }
-    return entry;
-  }
 }

framework/src/test/java/org/tron/common/overlay/discover/table/NodeTableTest.java

@@ -21,7 +21,7 @@ public class NodeTableTest {
 
   @Test
   public void test() {
-    Node node1 = Node.instanceOf("127.0.0.1:10002");
+    Node node1 = Node.instanceOf("127.0.0.5:10002");
 
     NodeTable table = new NodeTable(node1);
     Node nodeTemp = table.getNode();