This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch IOTDB-4564 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e5ced659b741aba8f8e132365940de3ca7074c56 Author: JackieTien97 <[email protected]> AuthorDate: Fri Sep 30 15:28:12 2022 +0800 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()); }
