This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch fix-pipe-source-reboot in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 055c848b0e680f5f639da5e653e31775718a890d Author: Steve Yurong Su <[email protected]> AuthorDate: Sat Jun 3 18:58:06 2023 +0800 reduce info message when there are only confignodes running in cluster --- .../apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java | 7 +++---- .../impl/pipe/runtime/PipeHandleLeaderChangeProcedure.java | 8 ++++---- .../impl/pipe/runtime/PipeHandleMetaChangeProcedure.java | 4 ++-- .../procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java | 6 +++--- .../procedure/impl/pipe/task/AbstractOperatePipeProcedureV2.java | 8 ++++++++ 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java index d19c3588468..8aaa0948f80 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java @@ -223,11 +223,10 @@ public class PipeTaskInfo implements SnapshotProcessor { dataRegionGroupId, new PipeTaskMeta( new MinimumProgressIndex(), newDataRegionLeader)); - } else { - LOGGER.warn( - "The pipe task meta does not contain the data region group {} or the data region group has already been removed", - dataRegionGroupId); } + // else: + // "The pipe task meta does not contain the data region group {} or + // the data region group has already been removed" } })); return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()); diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleLeaderChangeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleLeaderChangeProcedure.java index 0c218184b5c..3cbcebe6f6b 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleLeaderChangeProcedure.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleLeaderChangeProcedure.java @@ -100,10 +100,10 @@ public class PipeHandleLeaderChangeProcedure extends AbstractOperatePipeProcedur } @Override - protected void executeFromOperateOnDataNodes(ConfigNodeProcedureEnv env) throws IOException { + protected void executeFromOperateOnDataNodes(ConfigNodeProcedureEnv env) { LOGGER.info("PipeHandleLeaderChangeProcedure: executeFromHandleOnDataNodes"); - pushPipeMetaToDataNodes(env); + pushPipeMetaToDataNodesIgnoreException(env); } @Override @@ -142,10 +142,10 @@ public class PipeHandleLeaderChangeProcedure extends AbstractOperatePipeProcedur } @Override - protected void rollbackFromOperateOnDataNodes(ConfigNodeProcedureEnv env) throws IOException { + protected void rollbackFromOperateOnDataNodes(ConfigNodeProcedureEnv env) { LOGGER.info("PipeHandleLeaderChangeProcedure: rollbackFromCreateOnDataNodes"); - pushPipeMetaToDataNodes(env); + pushPipeMetaToDataNodesIgnoreException(env); } @Override diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java index 46a8fc1199a..39948e9fbb9 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java @@ -238,14 +238,14 @@ public class PipeHandleMetaChangeProcedure extends AbstractOperatePipeProcedureV } @Override - protected void executeFromOperateOnDataNodes(ConfigNodeProcedureEnv env) throws IOException { + protected void executeFromOperateOnDataNodes(ConfigNodeProcedureEnv env) { LOGGER.info("PipeHandleMetaChangeProcedure: executeFromHandleOnDataNodes"); if (!needPushPipeMetaToDataNodes) { return; } - pushPipeMetaToDataNodes(env); + pushPipeMetaToDataNodesIgnoreException(env); } @Override diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java index dfa2283775a..a7faa989ab9 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java @@ -66,10 +66,10 @@ public class PipeMetaSyncProcedure extends AbstractOperatePipeProcedureV2 { } @Override - protected void executeFromOperateOnDataNodes(ConfigNodeProcedureEnv env) throws IOException { + protected void executeFromOperateOnDataNodes(ConfigNodeProcedureEnv env) { LOGGER.info("PipeMetaSyncProcedure: executeFromOperateOnDataNodes"); - pushPipeMetaToDataNodes(env); + pushPipeMetaToDataNodesIgnoreException(env); } @Override @@ -94,7 +94,7 @@ public class PipeMetaSyncProcedure extends AbstractOperatePipeProcedureV2 { } @Override - protected void rollbackFromOperateOnDataNodes(ConfigNodeProcedureEnv env) throws IOException { + protected void rollbackFromOperateOnDataNodes(ConfigNodeProcedureEnv env) { LOGGER.info("PipeMetaSyncProcedure: rollbackFromOperateOnDataNodes"); // do nothing diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AbstractOperatePipeProcedureV2.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AbstractOperatePipeProcedureV2.java index 15065499562..133a74854be 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AbstractOperatePipeProcedureV2.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AbstractOperatePipeProcedureV2.java @@ -200,6 +200,14 @@ public abstract class AbstractOperatePipeProcedureV2 } } + protected void pushPipeMetaToDataNodesIgnoreException(ConfigNodeProcedureEnv env) { + try { + pushPipeMetaToDataNodes(env); + } catch (Throwable throwable) { + LOGGER.info("Failed to push pipe meta list to data nodes, will retry later.", throwable); + } + } + @Override public void serialize(DataOutputStream stream) throws IOException { super.serialize(stream);
