You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/07/24 10:43:32 UTC
[iotdb] 03/05: Revert "[To rel/1.1][IOTDB-6074] Ignore error message when TagManager createSnapshot"
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rc/1.1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 46117233268f691f1b86a3ed021dad57c03bb7c3
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Jul 24 18:23:24 2023 +0800
Revert "[To rel/1.1][IOTDB-6074] Ignore error message when TagManager createSnapshot"
This reverts commit ed7349151fd891bbfd81011ce1dc65dd6bdb63ea.
---
.../org/apache/iotdb/commons/utils/FileUtils.java | 10 ----------
.../mtree/snapshot/MemMTreeSnapshotUtil.java | 9 ++++-----
.../apache/iotdb/db/metadata/tag/TagManager.java | 22 +++++++---------------
3 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java b/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
index 5b698d71242..6a5e3e0f6cd 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
@@ -42,16 +42,6 @@ public class FileUtils {
private FileUtils() {}
- public static boolean deleteFileIfExist(File file) {
- try {
- Files.deleteIfExists(file.toPath());
- return true;
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- return false;
- }
- }
-
public static void deleteDirectory(File folder) {
if (folder.isDirectory()) {
for (File file : folder.listFiles()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/snapshot/MemMTreeSnapshotUtil.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/snapshot/MemMTreeSnapshotUtil.java
index c582c67f930..a03e6d22d46 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/snapshot/MemMTreeSnapshotUtil.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/snapshot/MemMTreeSnapshotUtil.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.metadata.mtree.snapshot;
import org.apache.iotdb.commons.file.SystemFileFactory;
-import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.db.metadata.MetadataConstant;
import org.apache.iotdb.db.metadata.mnode.EntityMNode;
import org.apache.iotdb.db.metadata.mnode.IEntityMNode;
@@ -82,7 +81,7 @@ public class MemMTreeSnapshotUtil {
new BufferedOutputStream(new FileOutputStream(snapshotTmp))) {
serializeTo(store, outputStream);
}
- if (snapshot.exists() && !FileUtils.deleteFileIfExist(snapshot)) {
+ if (snapshot.exists() && !snapshot.delete()) {
logger.error(
"Failed to delete old snapshot {} while creating mtree snapshot.", snapshot.getName());
return false;
@@ -92,17 +91,17 @@ public class MemMTreeSnapshotUtil {
"Failed to rename {} to {} while creating mtree snapshot.",
snapshotTmp.getName(),
snapshot.getName());
- FileUtils.deleteFileIfExist(snapshot);
+ snapshot.delete();
return false;
}
return true;
} catch (IOException e) {
logger.error("Failed to create mtree snapshot due to {}", e.getMessage(), e);
- FileUtils.deleteFileIfExist(snapshot);
+ snapshot.delete();
return false;
} finally {
- FileUtils.deleteFileIfExist(snapshotTmp);
+ snapshotTmp.delete();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java
index 4dc411f5100..206e0bb80c3 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.metadata.tag;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.file.SystemFileFactory;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.metadata.MetadataConstant;
@@ -34,6 +33,7 @@ import org.apache.iotdb.db.metadata.query.reader.ISchemaReader;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,8 +82,8 @@ public class TagManager {
SystemFileFactory.INSTANCE.getFile(targetDir, MetadataConstant.TAG_LOG_SNAPSHOT_TMP);
try {
tagLogFile.copyTo(tagLogSnapshotTmp);
- if (tagLogSnapshot.exists() && !FileUtils.deleteFileIfExist(tagLogSnapshot)) {
- logger.warn(
+ if (tagLogSnapshot.exists() && !tagLogSnapshot.delete()) {
+ logger.error(
"Failed to delete old snapshot {} while creating tagManager snapshot.",
tagLogSnapshot.getName());
return false;
@@ -93,25 +93,17 @@ public class TagManager {
"Failed to rename {} to {} while creating tagManager snapshot.",
tagLogSnapshotTmp.getName(),
tagLogSnapshot.getName());
- if (!FileUtils.deleteFileIfExist(tagLogSnapshot)) {
- logger.warn("Failed to delete {} after renaming failure.", tagLogSnapshot.getName());
- }
+ tagLogSnapshot.delete();
return false;
}
return true;
} catch (IOException e) {
logger.error("Failed to create tagManager snapshot due to {}", e.getMessage(), e);
- if (!FileUtils.deleteFileIfExist(tagLogSnapshot)) {
- logger.warn(
- "Failed to delete {} after creating tagManager snapshot failure.",
- tagLogSnapshot.getName());
- }
+ tagLogSnapshot.delete();
return false;
} finally {
- if (!FileUtils.deleteFileIfExist(tagLogSnapshotTmp)) {
- logger.warn("Failed to delete {}.", tagLogSnapshotTmp.getName());
- }
+ tagLogSnapshotTmp.delete();
}
}
@@ -125,7 +117,7 @@ public class TagManager {
}
try {
- org.apache.commons.io.FileUtils.copyFile(tagSnapshot, tagFile);
+ FileUtils.copyFile(tagSnapshot, tagFile);
return new TagManager(sgSchemaDirPath);
} catch (IOException e) {
tagFile.delete();