File tree Expand file tree Collapse file tree 2 files changed +13
-7
lines changed
src/main/java/org/tron/common/overlay Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -94,9 +94,7 @@ public void run() {
9494
9595 this .pongTimer = Executors .newSingleThreadScheduledExecutor ();
9696
97- for (Node node : args .getNodeActive ()) {
98- getNodeHandler (node ).getNodeStatistics ().setPredefined (true );
99- }
97+
10098 }
10199
102100 public ScheduledExecutorService getPongTimer () {
@@ -132,9 +130,19 @@ public void run() {
132130 for (Node node : bootNodes ) {
133131 getNodeHandler (node );
134132 }
133+
134+ for (Node node : args .getNodeActive ()) {
135+ getNodeHandler (node ).getNodeStatistics ().setPredefined (true );
136+ }
135137 }
136138 }
137139
140+ public boolean isNodeAlive (NodeHandler nodeHandler ){
141+ return nodeHandler .state .equals (State .Alive ) ||
142+ nodeHandler .state .equals (State .Active ) ||
143+ nodeHandler .state .equals (State .EvictCandidate );
144+ }
145+
138146 private void dbRead () {
139147 Set <Node > Nodes = this .dbManager .readNeighbours ();
140148 logger .info ("Reading Node statistics from PeersStore: " + Nodes .size () + " nodes." );
@@ -145,7 +153,7 @@ private void dbWrite() {
145153 Set <Node > batch = new HashSet <>();
146154 synchronized (this ) {
147155 for (NodeHandler nodeHandler : nodeHandlerMap .values ()){
148- if (! nodeHandler . state . equals ( NodeHandler . State . Dead )) {
156+ if (isNodeAlive ( nodeHandler )) {
149157 batch .add (nodeHandler .getNode ());
150158 }
151159 }
Original file line number Diff line number Diff line change @@ -195,9 +195,7 @@ public boolean test(NodeHandler handler) {
195195
196196 //TODO: use reputation sysytem
197197
198- if (handler .getState ().equals (NodeHandler .State .Discovered ) ||
199- handler .getState ().equals (NodeHandler .State .Dead ) ||
200- handler .getState ().equals (NodeHandler .State .NonActive )){
198+ if (!nodeManager .isNodeAlive (handler )){
201199 return false ;
202200 }
203201
You can’t perform that action at this time.
0 commit comments