This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch HighAvailability in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ea711694d146f0dd30c9a59369b3a52eb7bdee0b Author: JackieTien97 <[email protected]> AuthorDate: Tue Oct 24 09:22:30 2023 +0800 simplify error msg while one node down --- .../iotdb/consensus/iot/client/DispatchLogHandler.java | 15 +++++++++------ .../plan/scheduler/FragmentInstanceDispatcherImpl.java | 6 +++++- .../client/async/AsyncConfigNodeIServiceClient.java | 6 +++++- .../client/async/AsyncDataNodeInternalServiceClient.java | 6 +++++- .../async/AsyncDataNodeMPPDataExchangeServiceClient.java | 6 +++++- .../client/async/AsyncPipeDataTransferServiceClient.java | 6 +++++- 6 files changed, 34 insertions(+), 11 deletions(-) diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/DispatchLogHandler.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/DispatchLogHandler.java index 193adc6668b..cea19fce982 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/DispatchLogHandler.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/DispatchLogHandler.java @@ -25,6 +25,7 @@ import org.apache.iotdb.consensus.iot.logdispatcher.LogDispatcherThreadMetrics; import org.apache.iotdb.consensus.iot.thrift.TSyncLogEntriesRes; import org.apache.iotdb.rpc.TSStatusCode; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.thrift.async.AsyncMethodCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,12 +78,14 @@ public class DispatchLogHandler implements AsyncMethodCallback<TSyncLogEntriesRe @Override public void onError(Exception exception) { - logger.warn( - "Can not send {} to peer for {} times {} because {}", - batch, - thread.getPeer(), - ++retryCount, - exception); + if (logger.isWarnEnabled()) { + logger.warn( + "Can not send {} to peer for {} times {} because {}", + batch, + thread.getPeer(), + ++retryCount, + ExceptionUtils.getRootCause(exception).toString()); + } sleepCorrespondingTimeAndRetryAsynchronous(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java index 0e698c7b81c..a1ab241fa6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -48,6 +48,7 @@ import org.apache.iotdb.mpp.rpc.thrift.TSendSinglePlanNodeResp; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -339,7 +340,10 @@ public class FragmentInstanceDispatcherImpl implements IFragInstanceDispatcher { String.format("unknown read type [%s]", instance.getType()))); } } catch (ClientManagerException | TException e) { - logger.warn("can't connect to node {}", endPoint, e); + logger.warn( + "can't connect to node {}, error msg is {}.", + endPoint, + ExceptionUtils.getRootCause(e).toString()); TSStatus status = new TSStatus(); status.setCode(TSStatusCode.DISPATCH_ERROR.getStatusCode()); status.setMessage("can't connect to node " + endPoint); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeIServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeIServiceClient.java index 6f3c00de2a5..36d273c7b78 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeIServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeIServiceClient.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.client.property.ThriftClientProperty; import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService; import org.apache.iotdb.rpc.TNonblockingSocketWrapper; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.pool2.PooledObject; import org.apache.commons.pool2.impl.DefaultPooledObject; import org.apache.thrift.async.TAsyncClientManager; @@ -110,7 +111,10 @@ public class AsyncConfigNodeIServiceClient extends IConfigNodeRPCService.AsyncCl return true; } catch (Exception e) { if (printLogWhenEncounterException) { - logger.error("Unexpected exception occurs in {} : {}", this, e.getMessage()); + logger.error( + "Unexpected exception occurs in {}, error msg is {}", + this, + ExceptionUtils.getRootCause(e).toString()); } return false; } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java index 15f6c662d9f..7b617788c3e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java @@ -28,6 +28,7 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.mpp.rpc.thrift.IDataNodeRPCService; import org.apache.iotdb.rpc.TNonblockingSocketWrapper; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.pool2.PooledObject; import org.apache.commons.pool2.impl.DefaultPooledObject; import org.apache.thrift.async.TAsyncClientManager; @@ -123,7 +124,10 @@ public class AsyncDataNodeInternalServiceClient extends IDataNodeRPCService.Asyn return true; } catch (Exception e) { if (printLogWhenEncounterException) { - logger.error("Unexpected exception occurs in {} : {}", this, e.getMessage()); + logger.error( + "Unexpected exception occurs in {}, error msg is {}", + this, + ExceptionUtils.getRootCause(e).toString()); } return false; } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeMPPDataExchangeServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeMPPDataExchangeServiceClient.java index 97c5b1584de..6434ec7f017 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeMPPDataExchangeServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeMPPDataExchangeServiceClient.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.client.property.ThriftClientProperty; import org.apache.iotdb.mpp.rpc.thrift.MPPDataExchangeService; import org.apache.iotdb.rpc.TNonblockingSocketWrapper; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.pool2.PooledObject; import org.apache.commons.pool2.impl.DefaultPooledObject; import org.apache.thrift.async.TAsyncClientManager; @@ -111,7 +112,10 @@ public class AsyncDataNodeMPPDataExchangeServiceClient extends MPPDataExchangeSe return true; } catch (Exception e) { if (printLogWhenEncounterException) { - logger.error("Unexpected exception occurs in {} : {}", this, e.getMessage()); + logger.error( + "Unexpected exception occurs in {}, error msg is {}", + this, + ExceptionUtils.getRootCause(e).toString()); } return false; } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncPipeDataTransferServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncPipeDataTransferServiceClient.java index fc45ab60398..83f47956812 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncPipeDataTransferServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncPipeDataTransferServiceClient.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.client.property.ThriftClientProperty; import org.apache.iotdb.rpc.TNonblockingSocketWrapper; import org.apache.iotdb.service.rpc.thrift.IClientRPCService; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.pool2.PooledObject; import org.apache.commons.pool2.impl.DefaultPooledObject; import org.apache.thrift.async.TAsyncClientManager; @@ -127,7 +128,10 @@ public class AsyncPipeDataTransferServiceClient extends IClientRPCService.AsyncC return true; } catch (Exception e) { if (printLogWhenEncounterException) { - LOGGER.error("Unexpected exception occurs in {} : {}", this, e.getMessage()); + LOGGER.error( + "Unexpected exception occurs in {}, error msg is {}", + this, + ExceptionUtils.getRootCause(e).toString()); } return false; }
