This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 98b4e6f [IOTDB-790] change base_dir to system_dir (#1467)
98b4e6f is described below
commit 98b4e6fc05169fb385c7c5df6b05843da30c9d1d
Author: 张宇欣 <[email protected]>
AuthorDate: Sat Jul 11 22:37:01 2020 +0800
[IOTDB-790] change base_dir to system_dir (#1467)
* change base_dir to system_dir
---
.../assembly/resources/conf/iotdb-engine.properties | 9 ++++-----
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 21 ++++++---------------
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 21 ++++++++++++++-------
.../iotdb/db/conf/directories/DirectoryManager.java | 2 +-
.../apache/iotdb/db/monitor/MonitorConstants.java | 2 +-
.../java/org/apache/iotdb/db/service/Monitor.java | 4 ++--
.../org/apache/iotdb/db/service/MonitorMBean.java | 2 +-
.../iotdb/db/tools/memestimation/MemEstTool.java | 8 +++++++-
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 2 +-
.../org/apache/iotdb/db/utils/EnvironmentUtils.java | 7 ++-----
.../apache/iotdb/db/writelog/WriteLogNodeTest.java | 6 +++---
.../org/apache/iotdb/spark/db/EnvironmentUtils.java | 5 ++---
13 files changed, 45 insertions(+), 46 deletions(-)
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-engine.properties
index a52afb8..2947d2d 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -59,17 +59,16 @@ force_wal_period_in_ms=10
### Directory Configuration
####################
-# base dir
-# If this property is unset, system will save the data in the default relative
path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data).
+# system dir
+# If this property is unset, system will save the data in the default relative
path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data/system).
# If it is absolute, system will save the data in exact location it points to.
# If it is relative, system will save the data in the relative path directory
it indicates under the IoTDB folder.
-# Note: If sys_dir is assigned an empty string(i.e.,zero-size), it will be
handled as a relative path.
# For windows platform
# If its prefix is a drive specifier followed by "\\", or if its prefix is
"\\\\", then the path is absolute. Otherwise, it is relative.
-# base_dir=data
+# system_dir=data\\system
# For Linux platform
# If its prefix is "/", then the path is absolute. Otherwise, it is relative.
-# base_dir=data
+# system_dir=data/system
# data dirs
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 6d3eafc..510b9af 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -209,7 +209,7 @@ public class IoTDBConfig {
/**
* Wal directory.
*/
- private String walFolder = baseDir + File.separator + "wal";
+ private String walDir = baseDir + File.separator + "wal";
/**
* Maximum MemTable number in MemTable pool.
@@ -691,12 +691,11 @@ public class IoTDBConfig {
* if the folders are relative paths, add IOTDB_HOME as the path prefix
*/
private void formulateFolders() {
- baseDir = addHomeDir(baseDir);
systemDir = addHomeDir(systemDir);
schemaDir = addHomeDir(schemaDir);
syncDir = addHomeDir(syncDir);
- walFolder = addHomeDir(walFolder);
tracingDir = addHomeDir(tracingDir);
+ walDir = addHomeDir(walDir);
if
(TSFileDescriptor.getInstance().getConfig().getTSFileStorageFs().equals(FSType.HDFS))
{
String hdfsDir = getHdfsDir();
@@ -885,12 +884,12 @@ public class IoTDBConfig {
this.queryDir = queryDir;
}
- public String getWalFolder() {
- return walFolder;
+ public String getWalDir() {
+ return walDir;
}
- void setWalFolder(String walFolder) {
- this.walFolder = walFolder;
+ void setWalDir(String walDir) {
+ this.walDir = walDir;
}
public String getMultiDirStrategyClassName() {
@@ -1021,14 +1020,6 @@ public class IoTDBConfig {
this.languageVersion = languageVersion;
}
- public String getBaseDir() {
- return baseDir;
- }
-
- void setBaseDir(String baseDir) {
- this.baseDir = baseDir;
- }
-
public String getIpWhiteList() {
return ipWhiteList;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
index b36fc56..d116e71 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
@@ -52,7 +52,7 @@ public class IoTDBConfigCheck {
// If user delete folder "data", system.properties can reset.
private static final String PROPERTIES_FILE_NAME = "system.properties";
private static final String SCHEMA_DIR = config.getSchemaDir();
- private static final String WAL_DIR = config.getWalFolder();
+ private static final String WAL_DIR = config.getWalDir();
private File propertiesFile;
private File tmpPropertiesFile;
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 8b21986..109e43d 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -191,10 +191,17 @@ public class IoTDBDescriptor {
loadWALProps(properties);
- conf.setBaseDir(properties.getProperty("base_dir", conf.getBaseDir()));
-
- conf.setSystemDir(
- FilePathUtils.regularizePath(conf.getBaseDir()) +
IoTDBConstant.SYSTEM_FOLDER_NAME);
+ String systemDir = properties.getProperty("system_dir");
+ if(systemDir == null) {
+ systemDir = properties.getProperty("base_dir");
+ if(systemDir != null){
+ systemDir = FilePathUtils.regularizePath(systemDir) +
IoTDBConstant.SYSTEM_FOLDER_NAME;
+ }
+ else {
+ systemDir = conf.getSystemDir();
+ }
+ }
+ conf.setSystemDir(systemDir);
conf.setSchemaDir(
FilePathUtils.regularizePath(conf.getSystemDir()) +
IoTDBConstant.SCHEMA_FOLDER_NAME);
@@ -203,15 +210,15 @@ public class IoTDBDescriptor {
FilePathUtils.regularizePath(conf.getSystemDir()) +
IoTDBConstant.SYNC_FOLDER_NAME);
conf.setTracingDir(FilePathUtils
- .regularizePath(conf.getBaseDir() +
IoTDBConstant.TRACING_FOLDER_NAME));
+ .regularizePath(conf.getSystemDir() +
IoTDBConstant.TRACING_FOLDER_NAME));
conf.setQueryDir(
- FilePathUtils.regularizePath(conf.getBaseDir()) +
IoTDBConstant.QUERY_FOLDER_NAME);
+ FilePathUtils.regularizePath(conf.getSystemDir()) +
IoTDBConstant.QUERY_FOLDER_NAME);
conf.setDataDirs(properties.getProperty("data_dirs",
conf.getDataDirs()[0])
.split(","));
- conf.setWalFolder(properties.getProperty("wal_dir",
conf.getWalFolder()));
+ conf.setWalDir(properties.getProperty("wal_dir", conf.getWalDir()));
int walBufferSize =
Integer.parseInt(properties.getProperty("wal_buffer_size",
Integer.toString(conf.getWalBufferSize())));
diff --git
a/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
b/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
index 5d3c37c..5397561 100644
---
a/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
+++
b/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
@@ -158,7 +158,7 @@ public class DirectoryManager {
}
public String getWALFolder() {
- return IoTDBDescriptor.getInstance().getConfig().getWalFolder();
+ return IoTDBDescriptor.getInstance().getConfig().getWalDir();
}
public String getNextFolderForUnSequenceFile() throws
DiskSpaceInsufficientException {
diff --git
a/server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
b/server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
index 490743c..6344c1a 100644
--- a/server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
+++ b/server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
@@ -93,7 +93,7 @@ public class MonitorConstants {
public enum FileSizeConstants {
// TODO add multi data dir monitor
- WAL(new File(config.getWalFolder()).getAbsolutePath()),
+ WAL(new File(config.getWalDir()).getAbsolutePath()),
SYS(new File(config.getSystemDir()).getAbsolutePath());
public String getPath() {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/Monitor.java
b/server/src/main/java/org/apache/iotdb/db/service/Monitor.java
index f59eade..0765bc5 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/Monitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/Monitor.java
@@ -77,9 +77,9 @@ public class Monitor implements MonitorMBean, IService {
}
@Override
- public String getBaseDirectory() {
+ public String getSystemDirectory() {
try {
- File file = SystemFileFactory.INSTANCE.getFile(config.getBaseDir());
+ File file = SystemFileFactory.INSTANCE.getFile(config.getSystemDir());
return file.getAbsolutePath();
} catch (Exception e) {
logger.error("meet error while trying to get base dir.", e);
diff --git a/server/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
b/server/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
index 9b7a104..2dfe094 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
@@ -28,7 +28,7 @@ public interface MonitorMBean {
long getBufferWriteCacheSize();
- String getBaseDirectory();
+ String getSystemDirectory();
boolean getWriteAheadLogStatus();
diff --git
a/server/src/main/java/org/apache/iotdb/db/tools/memestimation/MemEstTool.java
b/server/src/main/java/org/apache/iotdb/db/tools/memestimation/MemEstTool.java
index 8e9e222..f765cbb 100644
---
a/server/src/main/java/org/apache/iotdb/db/tools/memestimation/MemEstTool.java
+++
b/server/src/main/java/org/apache/iotdb/db/tools/memestimation/MemEstTool.java
@@ -70,7 +70,13 @@ public class MemEstTool {
err(Throwables.getRootCause(e));
status = 2;
}
-
FileUtils.deleteDirectory(SystemFileFactory.INSTANCE.getFile(IoTDBDescriptor.getInstance().getConfig().getBaseDir()));
+
+
FileUtils.deleteDirectory(SystemFileFactory.INSTANCE.getFile(IoTDBDescriptor.getInstance().getConfig().getSystemDir()));
+
FileUtils.deleteDirectory(SystemFileFactory.INSTANCE.getFile(IoTDBDescriptor.getInstance().getConfig().getWalDir()));
+ for(int i=0; i <
IoTDBDescriptor.getInstance().getConfig().getDataDirs().length; i++){
+
FileUtils.deleteDirectory(SystemFileFactory.INSTANCE.getFile(IoTDBDescriptor.getInstance().getConfig().getDataDirs()[i]));
+ }
+
System.exit(status);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
b/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
index 7997f4c..c38dca4 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
@@ -263,7 +263,7 @@ public class OpenFileNumUtil {
TOTAL_OPEN_FILE_NUM(null),
SEQUENCE_FILE_OPEN_NUM(directoryManager.getAllSequenceFileFolders()),
UNSEQUENCE_FILE_OPEN_NUM(directoryManager.getAllUnSequenceFileFolders()),
- WAL_OPEN_FILE_NUM(Collections.singletonList(config.getWalFolder())),
+ WAL_OPEN_FILE_NUM(Collections.singletonList(config.getWalDir())),
DIGEST_OPEN_FILE_NUM(Collections.singletonList(config.getSystemDir())),
SOCKET_OPEN_FILE_NUM(null);
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
index ebe8a9e..05bbd0f 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
@@ -162,12 +162,9 @@ public class EnvironmentUtils {
// delete system info
cleanDir(config.getSystemDir());
// delete wal
- cleanDir(config.getWalFolder());
+ cleanDir(config.getWalDir());
// delete query
cleanDir(config.getQueryDir());
- // delete tracing
- cleanDir(config.getTracingDir());
- cleanDir(config.getBaseDir());
// delete data files
for (String dataDir : config.getDataDirs()) {
cleanDir(dataDir);
@@ -257,7 +254,7 @@ public class EnvironmentUtils {
// create storage group
createDir(config.getSystemDir());
// create wal
- createDir(config.getWalFolder());
+ createDir(config.getWalDir());
// create query
createDir(config.getQueryDir());
createDir(TestConstant.OUTPUT_DATA_DIR);
diff --git
a/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
b/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
index 82e0e3d..590a116 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
@@ -111,7 +111,7 @@ public class WriteLogNodeTest {
logNode.close();
File walFile = new File(
- config.getWalFolder() + File.separator + identifier + File.separator +
"wal1");
+ config.getWalDir() + File.separator + identifier + File.separator +
"wal1");
assertTrue(walFile.exists());
ILogReader reader = logNode.getLogReader();
@@ -178,7 +178,7 @@ public class WriteLogNodeTest {
logNode.write(bwInsertPlan);
File walFile = new File(
- config.getWalFolder() + File.separator + "root.logTestDevice" +
File.separator + "wal1");
+ config.getWalDir() + File.separator + "root.logTestDevice" +
File.separator + "wal1");
assertTrue(!walFile.exists());
logNode.write(deletePlan);
@@ -207,7 +207,7 @@ public class WriteLogNodeTest {
logNode.forceSync();
File walFile = new File(
- config.getWalFolder() + File.separator + "root.logTestDevice" +
File.separator + "wal1");
+ config.getWalDir() + File.separator + "root.logTestDevice" +
File.separator + "wal1");
assertTrue(walFile.exists());
assertTrue(new File(logNode.getLogDirectory()).exists());
diff --git
a/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java
b/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java
index 5d848a9..75bca6c 100644
---
a/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java
+++
b/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java
@@ -147,8 +147,7 @@ public class EnvironmentUtils {
// delete system info
cleanDir(config.getSystemDir());
// delete wal
- cleanDir(config.getWalFolder());
- cleanDir(config.getBaseDir());
+ cleanDir(config.getWalDir());
// delete data files
for (String dataDir : config.getDataDirs()) {
cleanDir(dataDir);
@@ -209,7 +208,7 @@ public class EnvironmentUtils {
// create storage group
createDir(config.getSystemDir());
// create wal
- createDir(config.getWalFolder());
+ createDir(config.getWalDir());
// create data
for (String dataDir: config.getDataDirs()) {
createDir(dataDir);
