add the block number check

lvs007 · lvs007 · commit e88f99fb4e2a · 2018-08-14T12:28:01.000+08:00
diff --git a/src/main/java/org/tron/common/overlay/discover/node/statistics/Reputation.java b/src/main/java/org/tron/common/overlay/discover/node/statistics/Reputation.java
@@ -74,7 +74,7 @@ int calculate(int baseScore) {
       reput += t.p2pHandShake.getTotalCount() > 0 ? 10 : 0;
       reput += min(t.tcpFlow.getTotalCount() / 10240, 20);
       reput += t.messageStatistics.p2pOutPing.getTotalCount() == t.messageStatistics.p2pInPong
-          .getTotalCount() ? 10 : -10;
+          .getTotalCount() ? 10 : 0;
       return reput;
     }
   }
diff --git a/src/main/java/org/tron/common/overlay/server/PeerConnectionCheckService.java b/src/main/java/org/tron/common/overlay/server/PeerConnectionCheckService.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -13,6 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.tron.common.overlay.discover.node.statistics.NodeStatistics;
 import org.tron.core.config.args.Args;
+import org.tron.core.db.Manager;
 import org.tron.core.net.peer.PeerConnection;
 import org.tron.protos.Protocol.ReasonCode;
 
@@ -23,21 +25,28 @@ public class PeerConnectionCheckService {
   public static final long CHECK_TIME = 5 * 60 * 1000L;
   private double disconnectNumberFactor = Args.getInstance().getDisconnectNumberFactor();
   private double maxConnectNumberFactor = Args.getInstance().getMaxConnectNumberFactor();
+  private static long beforeBlockNum = -1;
 
   @Autowired
   private SyncPool pool;
 
   @Autowired
   private ChannelManager channelManager;
 
-  private ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1,
+  @Autowired
+  private Manager manager;
+
+  private ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(2,
       r -> new Thread(r, "check-peer-connect"));
 
   @PostConstruct
   public void check() {
     logger.info("start the PeerConnectionCheckService");
+    beforeBlockNum = manager.getHeadBlockNum();
     scheduledExecutorService
         .scheduleWithFixedDelay(new CheckDataTransferTask(), 5, 5, TimeUnit.MINUTES);
+    scheduledExecutorService
+        .scheduleWithFixedDelay(new CheckBlockNumberHighTask(), 300, 5, TimeUnit.SECONDS);
   }
 
   @PreDestroy
@@ -81,4 +90,27 @@ public void run() {
     }
   }
 
+  private class CheckBlockNumberHighTask implements Runnable {
+
+    @Override
+    public void run() {
+      if (beforeBlockNum == manager.getHeadBlockNum()) {
+        logger.error("block number not change, now block number is : {}", beforeBlockNum);
+        //disconnect some score low peer
+        List<PeerConnection> peerList = new ArrayList<>(pool.getActivePeers());
+        peerList.sort(Comparator.comparingInt(o -> o.getNodeStatistics().getReputation()));
+        if (pool.getActivePeers().size() >= Args.getInstance().getNodeMaxActiveNodes() * Args
+            .getInstance().getActiveConnectFactor()) {
+          for (int i = 0; i < peerList.size() * 0.9; i++) {
+            logger.error("block number not change, disconnect the peer : {}",
+                peerList.get(i).getInetAddress());
+            peerList.get(i).disconnect(ReasonCode.RESET);
+          }
+        }
+      } else {
+        beforeBlockNum = manager.getHeadBlockNum();
+      }
+    }
+  }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ int calculate(int baseScore) {`
`74`	`74`	`reput += t.p2pHandShake.getTotalCount() > 0 ? 10 : 0;`
`75`	`75`	`reput += min(t.tcpFlow.getTotalCount() / 10240, 20);`
`76`	`76`	`reput += t.messageStatistics.p2pOutPing.getTotalCount() == t.messageStatistics.p2pInPong`
`77`		`- .getTotalCount() ? 10 : -10;`
	`77`	`+ .getTotalCount() ? 10 : 0;`
`78`	`78`	`return reput;`
`79`	`79`	`}`
`80`	`80`	`}`