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 d63813b instrument
new 45dacf6 Merge branch 'cluster_receiver_wait' of
https://github.com/apache/incubator-iotdb into cluster_receiver_wait
d63813b is described below
commit d63813be012d6bc634b88084d51968a934a5d012
Author: Ring-k <[email protected]>
AuthorDate: Tue Sep 1 11:12:43 2020 +0800
instrument
---
.../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 insertions(+)
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 b16dd7d..2f2bc2a 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,6 +1036,7 @@ public class DataGroupMember extends RaftMember {
*/
TSStatus executeNonQuery(PhysicalPlan plan) {
if (character == NodeCharacter.LEADER) {
+ // instrument here
TSStatus status = processPlanLocally(plan);
if (status != null) {
return status;
@@ -1044,6 +1045,7 @@ 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 fc7d725..74b3493 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
@@ -1390,6 +1390,7 @@ 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
@@ -1680,12 +1681,14 @@ 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 0cf0ff9..d8482b8 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
@@ -1234,6 +1234,7 @@ 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) {
@@ -1290,10 +1291,12 @@ 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:
