[incubator-iotdb] branch cluster_receiver_wait updated: Revert "instrument"

[yuyuankang]

This is an automated email from the ASF dual-hosted git repository.

yuyuankang pushed a commit to branch cluster_receiver_wait
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/cluster_receiver_wait by this 
push:
     new 7a9ecac  Revert "instrument"
7a9ecac is described below

commit 7a9ecacbc4bcfe69331312e0fb55d5dc5ad3b431
Author: Ring-k <yuyuank...@hotmail.com>
AuthorDate: Tue Sep 1 13:46:54 2020 +0800

    Revert "instrument"
    
    This reverts commit d63813be012d6bc634b88084d51968a934a5d012.
---
 .../java/org/apache/iotdb/cluster/server/member/DataGroupMember.java   | 2 --
 .../java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java   | 3 ---
 .../main/java/org/apache/iotdb/cluster/server/member/RaftMember.java   | 3 ---
 3 files changed, 8 deletions(-)

diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
index 2f2bc2a..b16dd7d 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
@@ -1036,7 +1036,6 @@ public class DataGroupMember extends RaftMember {
    */
   TSStatus executeNonQuery(PhysicalPlan plan) {
     if (character == NodeCharacter.LEADER) {
-      // instrument here
       TSStatus status = processPlanLocally(plan);
       if (status != null) {
         return status;
@@ -1045,7 +1044,6 @@ public class DataGroupMember extends RaftMember {
       return forwardPlan(plan, leader, getHeader());
     }
 
-    // instrument here
     waitLeader();
     // the leader can be itself after waiting
     if (character == NodeCharacter.LEADER) {
diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
index 99be7e8..170ccaa 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
@@ -1391,7 +1391,6 @@ public class MetaGroupMember extends RaftMember {
    */
   @Override
   public TSStatus executeNonQuery(PhysicalPlan plan) {
-    // instrument here
     if (PartitionUtils.isLocalNonQueryPlan(plan)) { // run locally
       return executeNonQueryLocally(plan);
     } else if (PartitionUtils.isGlobalMetaPlan(plan)) { //forward the plan to 
all meta group nodes
@@ -1682,14 +1681,12 @@ public class MetaGroupMember extends RaftMember {
   private TSStatus forwardToSingleGroup(Map.Entry<PhysicalPlan, 
PartitionGroup> entry) {
     if (entry.getValue().contains(thisNode)) {
       // the query should be handled by a group the local node is in, handle 
it with in the group
-      // instrument here
       logger.debug("Execute {} in a local group of {}", entry.getKey(),
           entry.getValue().getHeader());
       return getLocalDataMember(entry.getValue().getHeader())
           .executeNonQuery(entry.getKey());
     } else {
       // forward the query to the group that should handle it
-      // instrument here
       logger.debug("Forward {} to a remote group of {}", entry.getKey(),
           entry.getValue().getHeader());
       return forwardPlan(entry.getKey(), entry.getValue());
diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
index b0f0e22..29d830b 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
@@ -1232,7 +1232,6 @@ public abstract class RaftMember {
     if (readOnly) {
       return StatusUtils.NODE_READ_ONLY;
     }
-    // instrument here
     PhysicalPlanLog log = new PhysicalPlanLog();
     // assign term and index to the new log and append it
     synchronized (logManager) {
@@ -1289,12 +1288,10 @@ public abstract class RaftMember {
     int retryTime = 0;
     while (true) {
       logger.debug("{}: Send log {} to other nodes, retry times: {}", name, 
log, retryTime);
-      // instrument here
       AppendLogResult result = sendLogToFollowers(log, allNodes.size() / 2);
       switch (result) {
         case OK:
           logger.debug("{}: log {} is accepted", name, log);
-          // instrument here
           commitLog(log);
           return true;
         case TIME_OUT: