Merge pull request #6381 from zeusoo001/sync-problem

feat(net): optimize the log of synchronization failure

Author: kuny0707

framework/src/main/java/org/tron/core/net/service/sync/SyncService.java

@@ -124,7 +124,11 @@ public void syncNext(PeerConnection peer) {
       peer.setSyncChainRequested(new Pair<>(chainSummary, System.currentTimeMillis()));
       peer.sendMessage(new SyncBlockChainMessage(chainSummary));
     } catch (Exception e) {
-      logger.error("Peer {} sync failed, reason: {}", peer.getInetAddress(), e);
+      if (e instanceof P2pException) {
+        logger.warn("Peer {} sync failed, reason: {}", peer.getInetAddress(), e.getMessage());
+      } else {
+        logger.error("Peer {} sync failed.", peer.getInetAddress(), e);
+      }
       peer.disconnect(ReasonCode.SYNC_FAIL);
     }
   }

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

@@ -19,6 +19,7 @@
 import org.springframework.context.ApplicationContext;
 import org.tron.common.application.TronApplicationContext;
 import org.tron.common.utils.ReflectUtils;
+import org.tron.common.utils.Sha256Hash;
 import org.tron.core.Constant;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.config.DefaultConfig;
@@ -91,6 +92,13 @@ public void testStartSync() {
 
       ReflectUtils.setFieldValue(peer, "tronState", TronState.INIT);
 
+      try {
+        peer.setBlockBothHave(new BlockCapsule.BlockId(Sha256Hash.ZERO_HASH, -1));
+        service.syncNext(peer);
+      } catch (Exception e) {
+        // no need to deal with
+      }
+
       service.startSync(peer);
     } catch (Exception e) {
       // no need to deal with