You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2023/11/23 12:10:51 UTC
(iotdb) branch fix_6256 created (now f1198af0040)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch fix_6256
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at f1198af0040 fix close deadlock
This branch includes the following new commits:
new f1198af0040 fix close deadlock
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 close deadlock
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch fix_6256
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f1198af0040c86ea56f306bda8c108ccd96e028f
Author: Tian Jiang <jt...@163.com>
AuthorDate: Thu Nov 23 20:15:39 2023 +0800
fix close deadlock
---
.../db/storageengine/dataregion/DataRegion.java | 45 +++++++++++-----------
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index 0e825130f97..baecd5b57c6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -1624,33 +1624,32 @@ public class DataRegion implements IDataRegionForQuery {
/** This method will be blocked until all tsfile processors are closed. */
public void syncCloseAllWorkingTsFileProcessors() {
- synchronized (closeStorageGroupCondition) {
- try {
- List<Future<?>> tsFileProcessorsClosingFutures = asyncCloseAllWorkingTsFileProcessors();
- long startTime = System.currentTimeMillis();
- while (!closingSequenceTsFileProcessor.isEmpty()
- || !closingUnSequenceTsFileProcessor.isEmpty()) {
+ try {
+ List<Future<?>> tsFileProcessorsClosingFutures = asyncCloseAllWorkingTsFileProcessors();
+ long startTime = System.currentTimeMillis();
+ while (!closingSequenceTsFileProcessor.isEmpty()
+ || !closingUnSequenceTsFileProcessor.isEmpty()) {
+ synchronized (closeStorageGroupCondition) {
closeStorageGroupCondition.wait(60_000);
- if (System.currentTimeMillis() - startTime > 60_000) {
- logger.warn(
- "{} has spent {}s to wait for closing all TsFiles.",
- databaseName + "-" + this.dataRegionId,
- (System.currentTimeMillis() - startTime) / 1000);
- }
}
- for (Future<?> f : tsFileProcessorsClosingFutures) {
- if (f != null) {
- f.get();
- }
+ if (System.currentTimeMillis() - startTime > 60_000) {
+ logger.warn(
+ "{} has spent {}s to wait for closing all TsFiles.",
+ databaseName + "-" + this.dataRegionId,
+ (System.currentTimeMillis() - startTime) / 1000);
}
- } catch (InterruptedException | ExecutionException e) {
- logger.error(
- "CloseFileNodeCondition error occurs while waiting for closing the storage "
- + "group {}",
- databaseName + "-" + dataRegionId,
- e);
- Thread.currentThread().interrupt();
}
+ for (Future<?> f : tsFileProcessorsClosingFutures) {
+ if (f != null) {
+ f.get();
+ }
+ }
+ } catch (InterruptedException | ExecutionException e) {
+ logger.error(
+ "CloseFileNodeCondition error occurs while waiting for closing the storage " + "group {}",
+ databaseName + "-" + dataRegionId,
+ e);
+ Thread.currentThread().interrupt();
}
}