You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/08/30 02:36:52 UTC
[iotdb] branch master updated: [IOTDB-4271] Fix heartbeat error after setting a DataNode's status to Read-Only (#7166)
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 42865df4ee [IOTDB-4271] Fix heartbeat error after setting a DataNode's status to Read-Only (#7166)
42865df4ee is described below
commit 42865df4eef69acd1642525b573f9c494f300d6c
Author: YongzaoDan <33...@users.noreply.github.com>
AuthorDate: Tue Aug 30 10:36:44 2022 +0800
[IOTDB-4271] Fix heartbeat error after setting a DataNode's status to Read-Only (#7166)
---
.../confignode/manager/load/heartbeat/ConfigNodeHeartbeatCache.java | 2 +-
.../confignode/manager/load/heartbeat/DataNodeHeartbeatCache.java | 4 ++--
.../iotdb/confignode/manager/load/heartbeat/NodeHeartbeatSample.java | 2 +-
.../src/main/java/org/apache/iotdb/commons/cluster/NodeStatus.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/ConfigNodeHeartbeatCache.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/ConfigNodeHeartbeatCache.java
index 09d07aa29d..6fad139af4 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/ConfigNodeHeartbeatCache.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/ConfigNodeHeartbeatCache.java
@@ -80,6 +80,6 @@ public class ConfigNodeHeartbeatCache extends BaseNodeCache {
@Override
public NodeStatus getNodeStatus() {
// Return a copy of status
- return NodeStatus.valueOf(status.getStatus());
+ return NodeStatus.parse(status.getStatus());
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/DataNodeHeartbeatCache.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/DataNodeHeartbeatCache.java
index bf4f15a4b7..c2e67d0584 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/DataNodeHeartbeatCache.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/DataNodeHeartbeatCache.java
@@ -77,7 +77,7 @@ public class DataNodeHeartbeatCache extends BaseNodeCache {
}
return NodeStatus.isNormalStatus(status)
- != NodeStatus.isNormalStatus(NodeStatus.valueOf(originStatus));
+ != NodeStatus.isNormalStatus(NodeStatus.parse(originStatus));
}
@Override
@@ -97,6 +97,6 @@ public class DataNodeHeartbeatCache extends BaseNodeCache {
}
// Return a copy of status
- return NodeStatus.valueOf(status.getStatus());
+ return NodeStatus.parse(status.getStatus());
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/NodeHeartbeatSample.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/NodeHeartbeatSample.java
index 507b420c0a..7e0f858bd1 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/NodeHeartbeatSample.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/NodeHeartbeatSample.java
@@ -41,7 +41,7 @@ public class NodeHeartbeatSample {
public NodeHeartbeatSample(THeartbeatResp heartbeatResp, long receiveTimestamp) {
this.sendTimestamp = heartbeatResp.getHeartbeatTimestamp();
this.receiveTimestamp = receiveTimestamp;
- this.status = NodeStatus.valueOf(heartbeatResp.getStatus());
+ this.status = NodeStatus.parse(heartbeatResp.getStatus());
this.cpu = heartbeatResp.getCpu();
this.memory = heartbeatResp.getMemory();
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/cluster/NodeStatus.java b/node-commons/src/main/java/org/apache/iotdb/commons/cluster/NodeStatus.java
index 0bd5adfbf9..182aebe79f 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/cluster/NodeStatus.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/cluster/NodeStatus.java
@@ -30,7 +30,7 @@ public enum NodeStatus {
Removing("Removing"),
/** Only query statements are permitted */
- ReadOnly("Read-Only"),
+ ReadOnly("ReadOnly"),
/**
* Unrecoverable errors occur, system will be read-only or exit according to the param