adjust ResilienceServiceTest

Author: 317787106

framework/src/main/java/org/tron/core/net/service/effective/ResilienceService.java

@@ -29,6 +29,7 @@ public class ResilienceService {
   //when node is isolated, retention percent peers will not be disconnected
   public static final double retentionPercent = 0.8;
   private static final int initialDelay = 300;
+  public static final int broadcastPeerSize = 3;
   private static final String esName = "resilience-service";
   private final ScheduledExecutorService executor = ExecutorServiceManager
       .newSingleThreadScheduledExecutor(esName);
@@ -76,7 +77,7 @@ private void disconnectRandom() {
           .filter(peer -> !peer.getChannel().isTrustPeer())
           .filter(peer -> !peer.isNeedSyncFromUs() && !peer.isNeedSyncFromPeer())
           .collect(Collectors.toList());
-      if (peers.size() >= 3) {
+      if (peers.size() >= broadcastPeerSize) {
         Optional<PeerConnection> one = getEarliestPeer(peers);
         one.ifPresent(peer -> disconnectFromPeer(peer, ReasonCode.RANDOM_ELIMINATION,
             DisconnectCause.RANDOM_ELIMINATION));

framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java

@@ -51,7 +51,7 @@ public void testDisconnectRandom() {
     clearPeers();
     Assert.assertEquals(0, PeerManager.getPeers().size());
 
-    for (int i = 0; i < maxConnection; i++) {
+    for (int i = 0; i < maxConnection + 1; i++) {
       InetSocketAddress inetSocketAddress = new InetSocketAddress("201.0.0." + i, 10001);
       Channel c1 = spy(Channel.class);
       ReflectUtils.setFieldValue(c1, "inetSocketAddress", inetSocketAddress);
@@ -61,21 +61,37 @@ public void testDisconnectRandom() {
 
       PeerManager.add(context, c1);
     }
-    for (PeerConnection peer : PeerManager.getPeers()) {
+    for (PeerConnection peer : PeerManager.getPeers()
+        .subList(0, ResilienceService.broadcastPeerSize)) {
       peer.setNeedSyncFromPeer(false);
       peer.setNeedSyncFromUs(false);
+      peer.setLastInteractiveTime(System.currentTimeMillis() - 1000);
+    }
+    for (PeerConnection peer : PeerManager.getPeers()
+        .subList(ResilienceService.broadcastPeerSize, maxConnection + 1)) {
+      peer.setNeedSyncFromPeer(false);
+      peer.setNeedSyncFromUs(true);
     }
+    int size1 = (int) PeerManager.getPeers().stream()
+        .filter(peer -> !peer.isNeedSyncFromUs() && !peer.isNeedSyncFromPeer())
+        .count();
+    Assert.assertEquals(ResilienceService.broadcastPeerSize, size1);
+    Assert.assertEquals(maxConnection + 1, PeerManager.getPeers().size());
+
+    //disconnect from broadcasting peer
     ReflectUtils.invokeMethod(service, "disconnectRandom");
+    size1 = (int) PeerManager.getPeers().stream()
+        .filter(peer -> !peer.isNeedSyncFromUs() && !peer.isNeedSyncFromPeer())
+        .count();
+    Assert.assertEquals(ResilienceService.broadcastPeerSize - 1, size1);
     Assert.assertEquals(maxConnection, PeerManager.getPeers().size());
 
-    PeerConnection p1 = PeerManager.getPeers().get(1);
-    p1.setLastInteractiveTime(
-        System.currentTimeMillis() - Args.getInstance().inactiveThreshold * 1000L - 1000);
-    PeerConnection p2 = PeerManager.getPeers().get(10);
-    p2.setLastInteractiveTime(
-        System.currentTimeMillis() - Args.getInstance().inactiveThreshold * 1000L - 2000);
-
+    //disconnect from syncing peer
     ReflectUtils.invokeMethod(service, "disconnectRandom");
+    size1 = (int) PeerManager.getPeers().stream()
+        .filter(peer -> !peer.isNeedSyncFromUs() && !peer.isNeedSyncFromPeer())
+        .count();
+    Assert.assertEquals(ResilienceService.broadcastPeerSize - 1, size1);
     Assert.assertEquals(maxConnection - 1, PeerManager.getPeers().size());
   }