From 138c88487c6a38e037d194fd44339e210f060a09 Mon Sep 17 00:00:00 2001 From: wubin01 Date: Mon, 24 Jun 2019 15:02:45 +0800 Subject: [PATCH 1/3] modify nodes cfg --- .../java/org/tron/core/config/args/Args.java | 20 ++++++++++++------- src/main/java/org/tron/program/FullNode.java | 2 -- src/main/resources/config.conf | 3 ++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/tron/core/config/args/Args.java b/src/main/java/org/tron/core/config/args/Args.java index 4593036afbc..c54a2f61746 100644 --- a/src/main/java/org/tron/core/config/args/Args.java +++ b/src/main/java/org/tron/core/config/args/Args.java @@ -741,12 +741,6 @@ public static void setParam(final String[] args, final String confFileName) { config.hasPath("node.connection.timeout") ? config.getInt("node.connection.timeout") * 1000 : 0; - INSTANCE.activeNodes = getNodes(config, "node.active"); - - INSTANCE.passiveNodes = getNodes(config, "node.passive"); - - INSTANCE.fastForwardNodes = getNodes(config, "node.fastForward"); - INSTANCE.nodeChannelReadTimeout = config.hasPath("node.channel.read.timeout") ? config.getInt("node.channel.read.timeout") : 0; @@ -951,6 +945,12 @@ public static void setParam(final String[] args, final String confFileName) { .getInt("node.validContractProto.threads") : Runtime.getRuntime().availableProcessors(); + INSTANCE.activeNodes = getNodes(config, "node.active"); + + INSTANCE.passiveNodes = getNodes(config, "node.passive"); + + INSTANCE.fastForwardNodes = getNodes(config, "node.fastForward"); + initBackupProperty(config); if ("ROCKSDB".equals(Args.getInstance().getStorage().getDbEngine().toUpperCase())) { initRocksDbBackupProperty(config); @@ -1026,7 +1026,12 @@ private static List getNodes(final com.typesafe.config.Config config, Stri List list = config.getStringList(path); for (String configString : list) { Node n = Node.instanceOf(configString); - ret.add(n); + if (!(INSTANCE.nodeDiscoveryBindIp.equals(n.getHost()) || + INSTANCE.nodeExternalIp.equals(n.getHost()) || + "127.0.0.1".equals(n.getHost())) || + INSTANCE.nodeListenPort != n.getPort()) { + ret.add(n); + } } return ret; } @@ -1321,6 +1326,7 @@ private static void logConfig() { logger.info("Discover enable: {}", args.isNodeDiscoveryEnable()); logger.info("Active node size: {}", args.getActiveNodes().size()); logger.info("Passive node size: {}", args.getPassiveNodes().size()); + logger.info("FastForward node size: {}", args.getFastForwardNodes().size()); logger.info("Seed node size: {}", args.getSeedNode().getIpList().size()); logger.info("Max connection: {}", args.getNodeMaxActiveNodes()); logger.info("Max connection with same IP: {}", args.getNodeMaxActiveNodesWithSameIp()); diff --git a/src/main/java/org/tron/program/FullNode.java b/src/main/java/org/tron/program/FullNode.java index 25619c36980..81debdcac52 100644 --- a/src/main/java/org/tron/program/FullNode.java +++ b/src/main/java/org/tron/program/FullNode.java @@ -1,11 +1,9 @@ package org.tron.program; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; import java.io.File; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.tron.common.application.Application; diff --git a/src/main/resources/config.conf b/src/main/resources/config.conf index ba3cfffe83b..2787c3e6238 100644 --- a/src/main/resources/config.conf +++ b/src/main/resources/config.conf @@ -149,7 +149,8 @@ node { ] fastForward = [ - "47.90.208.194:18888" + "47.90.208.194:18888", + "47.75.212.39:18888" ] http { From 78059cde289a138e8b0af7739c4f64700ba16fef Mon Sep 17 00:00:00 2001 From: wubin01 Date: Mon, 24 Jun 2019 16:10:09 +0800 Subject: [PATCH 2/3] modify version to 3.6.1 --- src/main/java/org/tron/program/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/tron/program/Version.java b/src/main/java/org/tron/program/Version.java index 4430436db63..97c5c2ba245 100644 --- a/src/main/java/org/tron/program/Version.java +++ b/src/main/java/org/tron/program/Version.java @@ -1,7 +1,7 @@ package org.tron.program; public class Version { - private static final String version = "3.6.0"; + private static final String version = "3.6.1"; public static final String versionName = "Odyssey-v3.5.1-890-gd39973cbb"; public static final String versionCode = "10803"; From 630fcdfa3d79f2d0ec8b69643d3fcd651acf9292 Mon Sep 17 00:00:00 2001 From: wubin01 Date: Mon, 24 Jun 2019 18:32:58 +0800 Subject: [PATCH 3/3] modify syncpool test --- src/main/java/org/tron/common/overlay/server/SyncPool.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/tron/common/overlay/server/SyncPool.java b/src/main/java/org/tron/common/overlay/server/SyncPool.java index d8a7c131933..afce5d008e0 100644 --- a/src/main/java/org/tron/common/overlay/server/SyncPool.java +++ b/src/main/java/org/tron/common/overlay/server/SyncPool.java @@ -221,10 +221,6 @@ public boolean test(NodeHandler handler) { return false; } - if (handler.getNodeStatistics().getReputation() >= NodeStatistics.REPUTATION_PREDEFINED) { - return true; - } - InetAddress inetAddress = handler.getInetSocketAddress().getAddress(); if (channelManager.getRecentlyDisconnected().getIfPresent(inetAddress) != null) { return false;