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
commit c96a976aeeec1cec37b71666b9d6a03e891336e3 Author: OneSizeFitQuorum <[email protected]> AuthorDate: Mon Aug 21 18:22: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 +++-- 2 files changed, 5 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;
