You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/10/02 13:45:22 UTC
[iotdb] branch master updated: [IOTDB-4564] Fix NPE while print error log in FragmentInstanceDispatcherImpl
This is an automated email from the ASF dual-hosted git repository.
haonan 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 7e5651d331 [IOTDB-4564] Fix NPE while print error log in FragmentInstanceDispatcherImpl
7e5651d331 is described below
commit 7e5651d33126ed7afd13bcc72bc7c9645f32eb57
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Sun Oct 2 21:45:14 2022 +0800
[IOTDB-4564] Fix NPE while print error log in FragmentInstanceDispatcherImpl
---
.../iotdb/db/mpp/execution/executor/RegionWriteExecutor.java | 7 +++++--
.../db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java
index 6e8b26f187..bbf64f1073 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java
@@ -98,7 +98,7 @@ public class RegionWriteExecutor {
"Something wrong happened while calling consensus layer's write API.",
writeResponse.getException());
response.setAccepted(false);
- response.setMessage(writeResponse.getException().getMessage());
+ response.setMessage(writeResponse.getException().toString());
response.setStatus(RpcUtils.getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR));
}
return response;
@@ -198,7 +198,10 @@ public class RegionWriteExecutor {
"Something wrong happened while calling consensus layer's write API.",
writeResponse.getException());
response.setAccepted(false);
- response.setMessage(writeResponse.getException().getMessage());
+ response.setMessage(writeResponse.getException().toString());
+ response.setStatus(
+ RpcUtils.getStatus(
+ TSStatusCode.WRITE_PROCESS_ERROR, writeResponse.getException().toString()));
}
return response;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
index 4a9461612b..9f736ca222 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
@@ -170,11 +170,11 @@ public class FragmentInstanceDispatcherImpl implements IFragInstanceDispatcher {
instance.getRegionReplicaSet().getRegionId());
TSendPlanNodeResp sendPlanNodeResp = client.sendPlanNode(sendPlanNodeReq);
if (!sendPlanNodeResp.accepted) {
- logger.error(sendPlanNodeResp.getStatus().message);
+ logger.error(sendPlanNodeResp.message);
if (sendPlanNodeResp.getStatus() == null) {
throw new FragmentInstanceDispatchException(
RpcUtils.getStatus(
- TSStatusCode.EXECUTE_STATEMENT_ERROR, sendPlanNodeResp.getMessage()));
+ TSStatusCode.WRITE_PROCESS_ERROR, sendPlanNodeResp.getMessage()));
} else {
throw new FragmentInstanceDispatchException(sendPlanNodeResp.getStatus());
}