You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2023/04/28 05:45:14 UTC
[iotdb] branch rel/1.1 updated: [To rel/1.1] Forbid the query executor thread interrupted by other threads
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch rel/1.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.1 by this push:
new a8a836c49e [To rel/1.1] Forbid the query executor thread interrupted by other threads
a8a836c49e is described below
commit a8a836c49e21578889d80e630879dcb65f7f8ccf
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Fri Apr 28 13:45:07 2023 +0800
[To rel/1.1] Forbid the query executor thread interrupted by other threads
---
.../java/org/apache/iotdb/db/mpp/execution/driver/Driver.java | 2 +-
.../iotdb/db/mpp/execution/schedule/AbstractDriverThread.java | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java
index c3be5e1bbf..f92650bcde 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java
@@ -125,7 +125,7 @@ public abstract class Driver implements IDriver {
tryWithLock(
100,
TimeUnit.MILLISECONDS,
- true,
+ false,
() -> {
// only keep doing query processing if driver state is still alive
if (state.get() == State.ALIVE) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/AbstractDriverThread.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/AbstractDriverThread.java
index 72f5ce64a8..04db5adcb5 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/AbstractDriverThread.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/AbstractDriverThread.java
@@ -80,6 +80,15 @@ public abstract class AbstractDriverThread extends Thread implements Closeable {
next.setAbortCause(DriverTaskAbortedException.BY_INTERNAL_ERROR_SCHEDULED);
scheduler.toAborted(next);
}
+ } finally {
+ // Clear the interrupted flag on the current thread, driver cancellation may have
+ // triggered an interrupt
+ if (Thread.interrupted()) {
+ if (closed) {
+ // reset interrupted flag if closed before interrupt
+ Thread.currentThread().interrupt();
+ }
+ }
}
}
} finally {