You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2022/06/23 05:49:20 UTC
[iotdb] branch master updated: delete file before recovery in ratis mode (#6390)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new a3352882f1 delete file before recovery in ratis mode (#6390)
a3352882f1 is described below
commit a3352882f182cce7a3c1f9651d439682bdaaf462
Author: Marcos_Zyk <38...@users.noreply.github.com>
AuthorDate: Thu Jun 23 13:49:15 2022 +0800
delete file before recovery in ratis mode (#6390)
---
.../schemaregion/SchemaRegionMemoryImpl.java | 28 +++++++++++++---------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
index 8af29746f8..d42d02c334 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
@@ -22,6 +22,7 @@ import org.apache.iotdb.commons.consensus.SchemaRegionId;
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.consensus.ConsensusFactory;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -149,6 +150,7 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
private boolean isRecovering = true;
private volatile boolean initialized = false;
+ private String storageGroupDirPath;
private String schemaRegionDirPath;
private String storageGroupFullPath;
private SchemaRegionId schemaRegionId;
@@ -175,6 +177,9 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
storageGroupFullPath = storageGroup.getFullPath();
this.schemaRegionId = schemaRegionId;
+ storageGroupDirPath = config.getSchemaDir() + File.separator + storageGroupFullPath;
+ schemaRegionDirPath = storageGroupDirPath + File.separator + schemaRegionId.getId();
+
int cacheSize = config.getSchemaRegionDeviceNodeCacheSize();
mNodeCache =
Caffeine.newBuilder()
@@ -189,6 +194,14 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
});
this.storageGroupMNode = storageGroupMNode;
+
+ // In ratis mode, no matter create schemaRegion or recover schemaRegion, the working dir should
+ // be clear first
+ if (config.isClusterMode()
+ && config.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.RatisConsensus)) {
+ FileUtils.deleteDirectory(new File(schemaRegionDirPath));
+ }
+
init();
}
@@ -228,25 +241,18 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
}
private void initDir() throws SchemaDirCreationFailureException {
- String sgDirPath = config.getSchemaDir() + File.separator + storageGroupFullPath;
- File sgSchemaFolder = SystemFileFactory.INSTANCE.getFile(sgDirPath);
+ File sgSchemaFolder = SystemFileFactory.INSTANCE.getFile(storageGroupDirPath);
if (!sgSchemaFolder.exists()) {
if (sgSchemaFolder.mkdirs()) {
- logger.info("create storage group schema folder {}", sgDirPath);
+ logger.info("create storage group schema folder {}", storageGroupDirPath);
} else {
if (!sgSchemaFolder.exists()) {
- logger.error("create storage group schema folder {} failed.", sgDirPath);
- throw new SchemaDirCreationFailureException(sgDirPath);
+ logger.error("create storage group schema folder {} failed.", storageGroupDirPath);
+ throw new SchemaDirCreationFailureException(storageGroupDirPath);
}
}
}
- schemaRegionDirPath =
- config.getSchemaDir()
- + File.separator
- + storageGroupFullPath
- + File.separator
- + schemaRegionId.getId();
File schemaRegionFolder = SystemFileFactory.INSTANCE.getFile(schemaRegionDirPath);
if (!schemaRegionFolder.exists()) {
if (schemaRegionFolder.mkdirs()) {