You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ea...@apache.org on 2019/06/04 08:27:29 UTC
[incubator-iotdb] branch update_mult_dir_avoid_full_disk updated:
update
This is an automated email from the ASF dual-hosted git repository.
east pushed a commit to branch update_mult_dir_avoid_full_disk
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/update_mult_dir_avoid_full_disk by this push:
new 4ed2f0f update
4ed2f0f is described below
commit 4ed2f0f541444c6123053d30a5fe5a8036103d5f
Author: mdf369 <95...@qq.com>
AuthorDate: Tue Jun 4 16:27:15 2019 +0800
update
---
.../iotdb/db/conf/directories/Directories.java | 2 --
.../iotdb/db/sync/sender/SingleClientSyncTest.java | 2 +-
.../test/java/org/apache/iotdb/db/test/Test1.java | 36 ----------------------
.../test/java/org/apache/iotdb/db/test/Test2.java | 36 ----------------------
.../apache/iotdb/db/utils/EnvironmentUtils.java | 32 ++++++++++++++++++-
5 files changed, 32 insertions(+), 76 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/Directories.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/Directories.java
index db6e99a..d792c37 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/Directories.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/Directories.java
@@ -41,8 +41,6 @@ public class Directories {
private DirectoryStrategy strategy;
private Directories() {
- System.out.println("Init Directories.");
-
tsfileFolders = new ArrayList<>(
Arrays.asList(IoTDBDescriptor.getInstance().getConfig().getBufferWriteDirs()));
initFolders();
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java b/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
index 4326580..acd9359 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
@@ -179,7 +179,7 @@ public class SingleClientSyncTest {
fileSenderImpl.setConfig(config);
}
- public void setUp() throws StartupException {
+ public void setUp() throws StartupException, IOException {
if (testFlag) {
EnvironmentUtils.closeStatMonitor();
EnvironmentUtils.closeMemControl();
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/test/Test1.java b/iotdb/src/test/java/org/apache/iotdb/db/test/Test1.java
deleted file mode 100644
index f283600..0000000
--- a/iotdb/src/test/java/org/apache/iotdb/db/test/Test1.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.iotdb.db.test;
-
-import org.apache.iotdb.db.conf.directories.Directories;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class Test1 {
-
- private Directories directories = Directories.getInstance();
-
- @Before
- public void setup() {
- System.out.println("Test1.setup");
- }
-
- @After
- public void teardown() {
- System.out.println("Test1.teardown");
- }
-
- @Test
- public void method1() {
- System.out.println("Test1.method1");
- }
-
- @Test
- public void method2() {
- System.out.println("Test1.method2");
- }
-
- @Test
- public void method3() {
- System.out.println("Test1.method3");
- }
-}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/test/Test2.java b/iotdb/src/test/java/org/apache/iotdb/db/test/Test2.java
deleted file mode 100644
index 4955f34..0000000
--- a/iotdb/src/test/java/org/apache/iotdb/db/test/Test2.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.iotdb.db.test;
-
-import org.apache.iotdb.db.conf.directories.Directories;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class Test2 {
-
-// private Directories directories = Directories.getInstance();
-
- @Before
- public void setup() {
- System.out.println("Test2.setup");
- }
-
- @After
- public void teardown() {
- System.out.println("Test2.teardown");
- }
-
- @Test
- public void method1() {
- System.out.println("Test2.method1");
- }
-
- @Test
- public void method2() {
- System.out.println("Test2.method2");
- }
-
- @Test
- public void method3() {
- System.out.println("Test2.method3");
- }
-}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
index 31f12fd..e86ddd9 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
@@ -150,7 +150,9 @@ public class EnvironmentUtils {
config.setEnableMemMonitor(false);
}
- public static void envSetUp() throws StartupException {
+ public static void envSetUp() throws StartupException, IOException {
+ // create all directory
+ createAllDir();
// disable the memory control
config.setEnableMemMonitor(false);
// disable the system monitor
@@ -176,4 +178,32 @@ public class EnvironmentUtils {
LOGGER.error("", e);
}
}
+
+ private static void createAllDir() throws IOException {
+ // create bufferwrite
+ for (String path : directories.getAllTsFileFolders()) {
+ createDir(path);
+ }
+ // create overflow
+ createDir(config.getOverflowDataDir());
+ // create filenode
+ createDir(config.getFileNodeDir());
+ // create metadata
+ createDir(config.getMetadataDir());
+ // create wal
+ createDir(config.getWalFolder());
+ // create derby
+ createDir(config.getDerbyHome());
+ // create index
+ createDir(config.getIndexFileDir());
+ // create data
+ createDir("data");
+ // delte derby log
+ // cleanDir("derby.log");
+ }
+
+ public static void createDir(String dir) throws IOException {
+ File file = new File(dir);
+ file.mkdirs();
+ }
}