[incubator-iotdb] branch cluster_performance updated: index diff

[yu...@apache.org]

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

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


The following commit(s) were added to refs/heads/cluster_performance by this push:
     new d515a59  index diff
d515a59 is described below

commit d515a596f982d3b294a95a1c970754d7ffca49c5
Author: Ring-k <yu...@hotmail.com>
AuthorDate: Mon Sep 7 15:25:08 2020 +0800

    index diff
---
 .../main/java/org/apache/iotdb/cluster/ClusterMain.java  |  6 ++++--
 .../main/java/org/apache/iotdb/cluster/server/Timer.java |  7 +++++++
 .../apache/iotdb/cluster/server/member/RaftMember.java   | 16 +++++++++-------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
index bc1c68a..cf86bc7 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
@@ -29,6 +29,8 @@ import org.apache.iotdb.cluster.config.ClusterConfig;
 import org.apache.iotdb.cluster.config.ClusterDescriptor;
 import org.apache.iotdb.cluster.exception.ConfigInconsistentException;
 import org.apache.iotdb.cluster.exception.StartUpCheckFailureException;
+import org.apache.iotdb.cluster.partition.slot.SlotPartitionTable;
+import org.apache.iotdb.cluster.partition.slot.SlotStrategy;
 import org.apache.iotdb.cluster.rpc.thrift.Node;
 import org.apache.iotdb.cluster.server.MetaClusterServer;
 import org.apache.iotdb.cluster.server.Response;
@@ -257,7 +259,7 @@ public class ClusterMain {
     // customize data distribution
     // The given example tries to divide storage groups like "root.sg_0", "root.sg_1"... into k
     // nodes evenly.
-    /*SlotPartitionTable.slotStrategy = new SlotStrategy() {
+    SlotPartitionTable.slotStrategy = new SlotStrategy() {
       int k = 3;
       @Override
       public int calculateSlotByTime(String storageGroupName, long timestamp, int maxSlotNum) {
@@ -283,6 +285,6 @@ public class ClusterMain {
           return 0;
         }
       }
-    };*/
+    };
   }
 }
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/Timer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/Timer.java
index fda0b15..409d0fb 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/Timer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/Timer.java
@@ -43,6 +43,8 @@ public class Timer {
   public static AtomicLong raftMemberCommitLogResultCounter = new AtomicLong(0);
   public static AtomicLong raftMemberAppendLogResultMS = new AtomicLong(0);
   public static AtomicLong raftMemberAppendLogResultCounter = new AtomicLong(0);
+  public static AtomicLong indexDiff = new AtomicLong(0);
+  public static AtomicLong indexDiffCounter = new AtomicLong(0);
 
 
   private static final String dataGroupMemberProcessPlanLocallyMSString = "Data group member - process plan locally : ";
@@ -64,6 +66,7 @@ public class Timer {
   private static final String rafTMemberOfferLogString = "Raft member - offer log: ";
   private static final String raftMemberCommitLogResultString = "Raft member - commit log result: ";
   private static final String raftMemberAppendLogResultString = "Raft member - append log result: ";
+  public static final String indexDiffString = "Raft member - index diff: ";
 
 
 
@@ -153,6 +156,10 @@ public class Timer {
         + raftMemberCommitLogResultCounter + ", "
         + (double) raftMemberCommitLogResultMS.get()/1000000L / raftMemberCommitLogResultCounter.get() + "\n";
 
+    result += indexDiffString
+        + indexDiff.get()/1000000L + ", "
+        + indexDiffCounter + ", "
+        + (double) indexDiff.get()/1000000L / indexDiffCounter.get() + "\n";
 
 
     return result;
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 8964dac..9f2dadc 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
@@ -455,6 +455,8 @@ public abstract class RaftMember {
     long start = System.nanoTime();
     long lastLogIndex = logManager.getLastLogIndex();
     if (lastLogIndex < prevLogIndex) {
+      Timer.indexDiffCounter.incrementAndGet();
+      Timer.indexDiff.addAndGet(prevLogIndex - lastLogIndex);
       if (!waitForPrevLog(prevLogIndex)) {
         return Response.RESPONSE_LOG_MISMATCH;
       }
@@ -518,13 +520,13 @@ public abstract class RaftMember {
     Timer.raftMemberLogParseMS.addAndGet(System.nanoTime() - start1);
     Timer.raftMemberLogParseCounter.incrementAndGet();
 
-    if (log instanceof PhysicalPlanLog) {
-      PhysicalPlanLog physicalPlanLog = (PhysicalPlanLog) log;
-      PhysicalPlan plan = physicalPlanLog.getPlan();
-      if (plan instanceof InsertPlan) {
-        physicalPlanLog.setPlan(null);
-      }
-    }
+//    if (log instanceof PhysicalPlanLog) {
+//      PhysicalPlanLog physicalPlanLog = (PhysicalPlanLog) log;
+//      PhysicalPlan plan = physicalPlanLog.getPlan();
+//      if (plan instanceof InsertPlan) {
+//        physicalPlanLog.setPlan(null);
+//      }
+//    }
 
     long result = appendEntry(request.prevLogIndex, request.prevLogTerm, request.leaderCommit,
         log);