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 2024/09/06 06:09:04 UTC
(iotdb) branch rc/1.3.3 updated: Fix error log when drop database or migrate region (#13398) (#13429)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch rc/1.3.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rc/1.3.3 by this push:
new 10a2d82a9dd Fix error log when drop database or migrate region (#13398) (#13429)
10a2d82a9dd is described below
commit 10a2d82a9ddb02a79c57ef6399b11eb44ac10cb5
Author: Haonan <hh...@outlook.com>
AuthorDate: Fri Sep 6 14:08:58 2024 +0800
Fix error log when drop database or migrate region (#13398) (#13429)
* Fix error log when drop database or migrate region
* remove writer
---
.../dataregion/tsfile/timeindex/FileTimeIndexCacheRecorder.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/FileTimeIndexCacheRecorder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/FileTimeIndexCacheRecorder.java
index d6eb597922e..75fd5fb50f3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/FileTimeIndexCacheRecorder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/FileTimeIndexCacheRecorder.java
@@ -42,7 +42,7 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import static org.apache.iotdb.commons.utils.FileUtils.deleteDirectoryAndEmptyParent;
+import static org.apache.iotdb.commons.utils.FileUtils.deleteFileOrDirectory;
import static org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource.getFileTimeIndexSerializedSize;
public class FileTimeIndexCacheRecorder {
@@ -193,10 +193,11 @@ public class FileTimeIndexCacheRecorder {
}
public void removeFileTimeIndexCache(int dataRegionId) {
- for (FileTimeIndexCacheWriter writer : writerMap.values()) {
+ FileTimeIndexCacheWriter writer = writerMap.remove(dataRegionId);
+ if (writer != null) {
try {
writer.close();
- deleteDirectoryAndEmptyParent(writer.getLogFile());
+ deleteFileOrDirectory(writer.getLogFile(), true);
} catch (IOException e) {
LOGGER.warn("Meet error when close FileTimeIndexCache: {}", e.getMessage());
}