This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch consensus_module_refactor
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/consensus_module_refactor by
this push:
new 4461478a396 enhance some error message
4461478a396 is described below
commit 4461478a39605ed7732971d1f1dfcb7a9897e33f
Author: OneSizeFitQuorum <[email protected]>
AuthorDate: Mon Aug 21 17:12:08 2023 +0800
enhance some error message
Signed-off-by: OneSizeFitQuorum <[email protected]>
---
.../java/org/apache/iotdb/confignode/manager/PermissionManager.java | 5 ++---
.../java/org/apache/iotdb/confignode/manager/TriggerManager.java | 5 +++--
.../java/org/apache/iotdb/confignode/persistence/node/NodeInfo.java | 4 ++++
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/PermissionManager.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/PermissionManager.java
index cdefb50ffa0..7cbaeeeaec3 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/PermissionManager.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/PermissionManager.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.confignode.manager;
+import java.util.Collections;
import org.apache.iotdb.common.rpc.thrift.TDataNodeConfiguration;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.path.PartialPath;
@@ -94,9 +95,7 @@ public class PermissionManager {
LOGGER.warn("Failed in the read API executing the consensus layer due
to: ", e);
TSStatus res = new
TSStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode());
res.setMessage(e.getMessage());
- PermissionInfoResp response = new PermissionInfoResp();
- response.setStatus(res);
- return response;
+ return new PermissionInfoResp(res, Collections.emptyMap());
}
}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
index c57f8595600..372abdce430 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.confignode.manager;
+import java.io.IOException;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.path.PartialPath;
@@ -137,7 +138,7 @@ public class TriggerManager {
return ((TriggerTableResp)
configManager.getConsensusManager().read(new
GetTriggerTablePlan(onlyStateful)))
.convertToThriftResponse();
- } catch (Exception e) {
+ } catch (IOException | ConsensusException e) {
LOGGER.error("Fail to get TriggerTable", e);
return new TGetTriggerTableResp(
new TSStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode())
@@ -223,7 +224,7 @@ public class TriggerManager {
}
}
} catch (ConsensusException e) {
- LOGGER.warn("Failed in the write API executing the consensus layer due
to: ", e);
+ LOGGER.warn("Failed in the read/write API executing the consensus layer
due to: ", e);
TSStatus res = new
TSStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode());
res.setMessage(e.getMessage());
return res;
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/node/NodeInfo.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/node/NodeInfo.java
index aa5e0ed29c3..de977e7ceac 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/node/NodeInfo.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/node/NodeInfo.java
@@ -95,6 +95,7 @@ public class NodeInfo implements SnapshotProcessor {
private final Map<Integer, TDataNodeConfiguration> registeredDataNodes;
private final Map<Integer, TNodeVersionInfo> nodeVersionInfo;
+ private static final TNodeVersionInfo UNKNOWN_NODE_VERSION_INFO = new
TNodeVersionInfo("Unknown", "Unknown");
private static final String SNAPSHOT_FILENAME = "node_info.bin";
public NodeInfo() {
@@ -312,6 +313,7 @@ public class NodeInfo implements SnapshotProcessor {
applyConfigNodePlan.getConfigNodeLocation().getConfigNodeId(),
applyConfigNodePlan.getConfigNodeLocation());
SystemPropertiesUtils.storeConfigNodeList(new
ArrayList<>(registeredConfigNodes.values()));
+
nodeVersionInfo.put(applyConfigNodePlan.getConfigNodeLocation().getConfigNodeId(),
UNKNOWN_NODE_VERSION_INFO);
LOGGER.info(
"Successfully apply ConfigNode: {}. Current ConfigNodeGroup: {}",
applyConfigNodePlan.getConfigNodeLocation(),
@@ -550,6 +552,7 @@ public class NodeInfo implements SnapshotProcessor {
TConfigNodeLocation configNodeLocation = new TConfigNodeLocation();
configNodeLocation.read(protocol);
registeredConfigNodes.put(configNodeId, configNodeLocation);
+ nodeVersionInfo.put(configNodeId, UNKNOWN_NODE_VERSION_INFO);
size--;
}
}
@@ -562,6 +565,7 @@ public class NodeInfo implements SnapshotProcessor {
TDataNodeConfiguration dataNodeInfo = new TDataNodeConfiguration();
dataNodeInfo.read(protocol);
registeredDataNodes.put(dataNodeId, dataNodeInfo);
+ nodeVersionInfo.put(dataNodeId, UNKNOWN_NODE_VERSION_INFO);
size--;
}
}
