Merge branch 'develop' into hotfix/trace_result_set

Author: ithinker1991

.circleci/config.yml

@@ -18,7 +18,7 @@ jobs:
 #
 #    - run:
 #        name: Daily Build Report
-#        command: curl http://60.205.215.34/Daily_Build_Task_Report
+#        command: curl http://47.95.206.44:50080/Daily_Build_Task_Report
 #
 #    - run:
 #        name: Download Links

.gitignore

@@ -54,4 +54,4 @@ nodeId.properties
 Wallet
 
 # vm_trace
-/vm_trace/
+/vm_trace/

DownloadLinks.sh

@@ -1,21 +1,21 @@
-PassFlag=`curl -s http://60.205.215.34/Daily_Build_Task_Report | grep "Failed: 0" | wc -c`
+PassFlag=`curl -s http://47.95.206.44:50080/Daily_Build_Task_Report | grep "Failed: 0" | wc -c`
 
 if [ $PassFlag -eq 0 ]; then
     echo "Daily Build Stest Fail"
     echo "To view Daily Replay and Stress Test logs please visit website below on browsers"
-    echo "--- http://60.205.215.34/latestReplayLog"
-    echo "--- http://60.205.215.34/latestStressLog"
+    echo "--- http://47.95.206.44:50080/latestReplayLog"
+    echo "--- http://47.95.206.44:50080/latestStressLog"
 
 else
     echo "Daily Build Stest Pass"
     echo "Build on `date +"%Y-%m-%d"` 3:00:00 (CST), UTC +8"
     echo "Please visit following website to download java-tron.jar on browsers"
-    echo "--- http://60.205.215.34/Daily_Build/java-tron.jar"
+    echo "--- http://47.95.206.44:50080/Daily_Build/jFava-tron.jar"
     echo "To view Daily Replay and Stress Test logs please visit website below on browsers"
-    echo "--- http://60.205.215.34/latestReplayLog"
-    echo "--- http://60.205.215.34/latestStressLog"
+    echo "--- http://47.95.206.44:50080/latestReplayLog"
+    echo "--- http://47.95.206.44:50080/latestStressLog"
     echo "The following compressed package is provided for user to set up Fullnode. Please use Linux OS to Download"
-    echo "--- curl -# -O http://60.205.215.34/Daily_Build/java-tron.tar.gz"
+    echo "--- curl -# -O http://47.95.206.44:50080/Daily_Build/java-tron.tar.gz"
     echo "To unzip file use the command below"
     echo "--- tar -xzvf java-tron.tar.gz"
 fi

deploy.sh

@@ -1,17 +1,19 @@
 #!/bin/bash
 if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
     stestlogname="`date +%Y%m%d%H%M%S`_stest.log"
+    timeout 10 ping -c 5  47.93.42.145 > /dev/null || exit 1
+    timeout 10 ping -c 5  47.93.18.60  > /dev/null || exit 1
     stest_server=""
-    docker_num_in_67=`ssh -p 22008 -t [email protected] 'docker ps -a | wc -l'`
-    docker_num_in_67=`echo $docker_num_in_67 | tr -d "\r"`
-    docker_num_in_122=`ssh -p 22008 -t [email protected] 'docker ps -a | wc -l'`
-    docker_num_in_122=`echo $docker_num_in_122 | tr -d "\r"`
-    if [ $docker_num_in_67 -le $docker_num_in_122 ];
+    docker_num_in_145=`ssh -p 22008 -t [email protected] 'docker ps -a | wc -l'`
+    docker_num_in_145=`echo $docker_num_in_145 | tr -d "\r"`
+    docker_num_in_60=`ssh -p 22008 -t [email protected] 'docker ps -a | wc -l'`
+    docker_num_in_60=`echo $docker_num_in_60 | tr -d "\r"`
+    if [ $docker_num_in_145 -le $docker_num_in_60 ];
       then
-      docker_num=$docker_num_in_67
+      docker_num=$docker_num_in_145
       stest_server=47.93.42.145
       else
-        docker_num=$docker_num_in_122
+        docker_num=$docker_num_in_60
         stest_server=47.93.18.60
     fi
 

src/main/java/org/tron/common/overlay/discover/node/NodeHandler.java

@@ -95,7 +95,7 @@ public NodeHandler(Node node, NodeManager nodeManager) {
     this.node = node;
     this.nodeManager = nodeManager;
     this.inetSocketAddress = new InetSocketAddress(node.getHost(), node.getPort());
-    this.nodeStatistics = new NodeStatistics(node);
+    this.nodeStatistics = new NodeStatistics();
     changeState(State.Discovered);
   }
 
@@ -201,8 +201,7 @@ public void handlePing(PingMessage msg) {
   public void handlePong(PongMessage msg) {
     if (waitForPong) {
       waitForPong = false;
-      getNodeStatistics().discoverMessageLatency
-          .add((double) System.currentTimeMillis() - pingSent);
+      getNodeStatistics().discoverMessageLatency.add(System.currentTimeMillis() - pingSent);
       getNodeStatistics().lastPongReplyTime.set(System.currentTimeMillis());
       node.setId(msg.getFrom().getId());
       if (msg.getVersion() != Args.getInstance().getNodeP2pVersion()) {

src/main/java/org/tron/common/overlay/discover/node/statistics/NodeStatistics.java

@@ -21,6 +21,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import lombok.Getter;
+import lombok.Setter;
 import org.tron.common.overlay.discover.node.Node;
 import org.tron.core.config.args.Args;
 import org.tron.protos.Protocol.ReasonCode;
@@ -48,12 +49,15 @@ public class NodeStatistics {
   public final MessageCount tcpFlow = new MessageCount();
 
   public final SimpleStatter discoverMessageLatency;
+  public final SimpleStatter pingMessageLatency;
+
   public final AtomicLong lastPongReplyTime = new AtomicLong(0L); // in milliseconds
 
   private Reputation reputation;
 
-  public NodeStatistics(Node node) {
-    discoverMessageLatency = new SimpleStatter(node.getIdString());
+  public NodeStatistics() {
+    discoverMessageLatency = new SimpleStatter();
+    pingMessageLatency = new SimpleStatter();
     reputation = new Reputation(this);
   }
 
@@ -182,40 +186,26 @@ public String toString() {
   }
 
   public class SimpleStatter {
-
-    private final String name;
-    private volatile double last;
-    private volatile double sum;
-    private AtomicInteger count = new AtomicInteger();
-
-    public SimpleStatter(String name) {
-      this.name = name;
-    }
-
-    public void add(double value) {
+    private long sum;
+    @Getter
+    private long count;
+    @Getter
+    private long last;
+    @Getter
+    private long min;
+    @Getter
+    private long max;
+
+    public void add(long value) {
       last = value;
       sum += value;
-      count.incrementAndGet();
-    }
-
-    public double getLast() {
-      return last;
-    }
-
-    public int getCount() {
-      return count.get();
-    }
-
-    public double getSum() {
-      return sum;
-    }
-
-    public double getAvrg() {
-      return count.get() == 0 ? 0 : sum / count.get();
+      min = min == 0? value : Math.min(min, value);
+      max = Math.max(max, value);
+      count++;
     }
 
-    public String getName() {
-      return name;
+    public long getAvrg() {
+      return count == 0 ? 0 : sum / count;
     }
 
   }

src/main/java/org/tron/common/overlay/server/Channel.java

@@ -1,20 +1,3 @@
-/*
- * Copyright (c) [2016] [ <ether.camp> ]
- * This file is part of the ethereumJ library.
- *
- * The ethereumJ library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The ethereumJ library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with the ethereumJ library. If not, see <http://www.gnu.org/licenses/>.
- */
 package org.tron.common.overlay.server;
 
 import io.netty.channel.ChannelHandlerContext;
@@ -90,10 +73,6 @@ public class Channel {
 
   private volatile boolean isDisconnect;
 
-  private String remoteId;
-
-  private PeerStatistics peerStats = new PeerStatistics();
-
   private boolean isTrustPeer;
 
   private boolean isFastForwardPeer;
@@ -103,8 +82,6 @@ public void init(ChannelPipeline pipeline, String remoteId, boolean discoveryMod
 
     this.channelManager = channelManager;
 
-    this.remoteId = remoteId;
-
     isActive = remoteId != null && !remoteId.isEmpty();
 
     startTime = System.currentTimeMillis();
@@ -129,7 +106,7 @@ public void init(ChannelPipeline pipeline, String remoteId, boolean discoveryMod
   }
 
   public void publicHandshakeFinished(ChannelHandlerContext ctx, HelloMessage msg) {
-    isTrustPeer = channelManager.getTrustNodes().containsKey(getInetAddress());
+    isTrustPeer = channelManager.getTrustNodes().getIfPresent(getInetAddress()) != null;
     isFastForwardPeer = channelManager.getFastForwardNodes().containsKey(getInetAddress());
     ctx.pipeline().remove(handshakeHandler);
     msgQueue.activate(ctx);
@@ -197,10 +174,6 @@ public enum TronState {
     SYNC_FAILED
   }
 
-  public PeerStatistics getPeerStats() {
-    return peerStats;
-  }
-
   public Node getNode() {
     return node;
   }

src/main/java/org/tron/common/overlay/server/ChannelManager.java

@@ -50,7 +50,7 @@ public class ChannelManager {
       .maximumSize(1000).expireAfterWrite(30, TimeUnit.SECONDS).recordStats().build();
 
   @Getter
-  private Map<InetAddress, Node> trustNodes = new ConcurrentHashMap();
+  private Cache<InetAddress, Node> trustNodes = CacheBuilder.newBuilder().maximumSize(100).build();
 
   @Getter
   private Map<InetAddress, Node> activeNodes = new ConcurrentHashMap();
@@ -126,7 +126,7 @@ public void notifyDisconnect(Channel channel) {
 
   public synchronized boolean processPeer(Channel peer) {
 
-    if (!trustNodes.containsKey(peer.getInetAddress())) {
+    if (trustNodes.getIfPresent(peer.getInetAddress()) == null) {
       if (recentlyDisconnected.getIfPresent(peer) != null) {
         logger.info("Peer {} recently disconnected.", peer.getInetAddress());
         return false;

src/main/java/org/tron/common/overlay/server/FastForward.java

@@ -1,5 +1,6 @@
 package org.tron.common.overlay.server;
 
+import com.google.protobuf.ByteString;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.List;
@@ -13,10 +14,8 @@
 import org.tron.common.backup.BackupManager;
 import org.tron.common.backup.BackupManager.BackupStatusEnum;
 import org.tron.common.overlay.discover.node.Node;
-import org.tron.common.overlay.discover.node.NodeManager;
 import org.tron.core.config.args.Args;
-import org.tron.core.db.Manager;
-import org.tron.core.db.WitnessStore;
+import org.tron.core.db.WitnessScheduleStore;
 import org.tron.core.services.WitnessService;
 import org.tron.protos.Protocol.ReasonCode;
 
@@ -27,12 +26,6 @@ public class FastForward {
   @Autowired
   private ApplicationContext ctx;
 
-  private Manager manager;
-
-  private WitnessStore witnessStore;
-
-  private NodeManager nodeManager;
-
   private ChannelManager channelManager;
 
   private BackupManager backupManager;
@@ -41,7 +34,8 @@ public class FastForward {
 
   private Args args = Args.getInstance();
   private List<Node> fastForwardNodes = args.getFastForwardNodes();
-  private byte[] witnessAddress = args.getLocalWitnesses().getWitnessAccountAddress();
+  private ByteString witnessAddress = ByteString
+      .copyFrom(args.getLocalWitnesses().getWitnessAccountAddress());
   private int keySize = args.getLocalWitnesses().getPrivateKeys().size();
 
   public void init() {
@@ -53,21 +47,14 @@ public void init() {
       return;
     }
 
-    manager = ctx.getBean(Manager.class);
-    witnessStore = ctx.getBean(WitnessStore.class);
-    nodeManager = ctx.getBean(NodeManager.class);
     channelManager = ctx.getBean(ChannelManager.class);
     backupManager = ctx.getBean(BackupManager.class);
-
-    if (args.getFastForwardNodes().size() > 0) {
-      fastForwardNodes = args.getFastForwardNodes();
-    }
+    WitnessScheduleStore witnessScheduleStore = ctx.getBean(WitnessScheduleStore.class);
 
     executorService.scheduleWithFixedDelay(() -> {
       try {
-        if (witnessStore.get(witnessAddress) != null &&
-            backupManager.getStatus().equals(BackupStatusEnum.MASTER) &&
-            !WitnessService.isNeedSyncCheck()) {
+        if (witnessScheduleStore.getActiveWitnesses().contains(witnessAddress) &&
+            backupManager.getStatus().equals(BackupStatusEnum.MASTER)) {
           connect();
         } else {
           disconnect();
@@ -90,11 +77,10 @@ private void disconnect() {
       InetAddress address = new InetSocketAddress(node.getHost(), node.getPort()).getAddress();
       channelManager.getActiveNodes().remove(address);
       channelManager.getActivePeers().forEach(channel -> {
-        if (channel.getNode().equals(node)) {
+        if (channel.getInetAddress().equals(address)) {
           channel.disconnect(ReasonCode.RESET);
         }
       });
     });
   }
-
 }

src/main/java/org/tron/common/overlay/server/HandshakeHandler.java

@@ -123,7 +123,7 @@ private void handleHelloMsg(ChannelHandlerContext ctx, HelloMessage msg) {
 
     if (remoteId.length != 64) {
       InetAddress address = ((InetSocketAddress) ctx.channel().remoteAddress()).getAddress();
-      if (!channelManager.getTrustNodes().keySet().contains(address) && !syncPool.isCanConnect()) {
+      if (channelManager.getTrustNodes().getIfPresent(address) == null && !syncPool.isCanConnect()) {
         channel.disconnect(ReasonCode.TOO_MANY_PEERS);
         return;
       }