You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by we...@apache.org on 2026/10/08 03:55:23 UTC
(iotdb) branch fixStopDN created (now dcf5a9248bd)
This is an automated email from the ASF dual-hosted git repository.
Wei-hao-Li pushed a change to branch fixStopDN
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at dcf5a9248bd fix some
This branch includes the following new commits:
new dcf5a9248bd fix some
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(iotdb) 01/01: fix some
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
Wei-hao-Li pushed a commit to branch fixStopDN
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dcf5a9248bdb82f2eea47c3be025707792b0b03f
Author: Weihao Li <18...@163.com>
AuthorDate: Thu Oct 8 11:55:00 2026 +0800
fix some
Signed-off-by: Weihao Li <18...@163.com>
---
.../execution/fragment/FragmentInstanceExecution.java | 11 ++++++++---
.../db/queryengine/execution/schedule/DriverScheduler.java | 9 +++++++--
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java
index 0b6e376d3b8..b2fdeaac4f1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.queryengine.execution.fragment;
import org.apache.iotdb.calc.exception.MemoryNotEnoughException;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -332,7 +333,9 @@ public class FragmentInstanceExecution {
try {
clearShuffleSinkHandle(newState);
} catch (Throwable t) {
- LOGGER.error(DataNodeQueryMessages.ERRORS_RELEASING_SINK, t);
+ if (!CommonDescriptor.getInstance().getConfig().isStopping()) {
+ LOGGER.error(DataNodeQueryMessages.ERRORS_RELEASING_SINK, t);
+ }
}
// close the driver after sink is aborted or closed because in driver.close() it
@@ -358,8 +361,10 @@ public class FragmentInstanceExecution {
exchangeManager.deRegisterFragmentInstanceFromMemoryPool(
instanceId.getQueryId().getId(), instanceId.getFragmentInstanceId(), true);
} catch (Throwable t) {
- LOGGER.error(
- DataNodeQueryMessages.ERRORS_DEREGISTER_FI_FROM_MEMORY_POOL, newState, t);
+ if (!CommonDescriptor.getInstance().getConfig().isStopping()) {
+ LOGGER.error(
+ DataNodeQueryMessages.ERRORS_DEREGISTER_FI_FROM_MEMORY_POOL, newState, t);
+ }
}
try {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java
index 0485de570fe..7f84e3ee761 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.calc.exception.MemoryNotEnoughException;
import org.apache.iotdb.calc.execution.schedule.queue.IndexedBlockingQueue;
import org.apache.iotdb.calc.execution.schedule.queue.IndexedBlockingReserveQueue;
import org.apache.iotdb.commons.concurrent.ThreadName;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.StartupException;
import org.apache.iotdb.commons.queryengine.common.SessionInfo;
@@ -394,7 +395,9 @@ public class DriverScheduler implements IDriverScheduler, IService {
try {
task.getDriver().failed(task.getAbortCause().get());
} catch (Exception e) {
- logger.error(DataNodeQueryMessages.CLEAR_DRIVERTASK_FAILED, e);
+ if (!CommonDescriptor.getInstance().getConfig().isStopping()) {
+ logger.error(DataNodeQueryMessages.CLEAR_DRIVERTASK_FAILED, e);
+ }
}
}
if (task.getStatus() == DriverTaskStatus.ABORTED) {
@@ -405,7 +408,9 @@ public class DriverScheduler implements IDriverScheduler, IService {
task.getDriverTaskId().getFragmentId().getId(),
task.getDriverTaskId().getFragmentInstanceId().getInstanceId()));
} catch (Exception e) {
- logger.error(DataNodeQueryMessages.CLEAR_DRIVERTASK_FAILED, e);
+ if (!CommonDescriptor.getInstance().getConfig().isStopping()) {
+ logger.error(DataNodeQueryMessages.CLEAR_DRIVERTASK_FAILED, e);
+ }
}
}
} finally {