You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/04/24 06:35:40 UTC
[incubator-iotdb] branch master updated: close MemMonitor in
EnvironmentUtil.cleanEnv() (#164)
This is an automated email from the ASF dual-hosted git repository.
hxd 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 cfb16b2 close MemMonitor in EnvironmentUtil.cleanEnv() (#164)
cfb16b2 is described below
commit cfb16b22c1b821ddffb9c8f734ea95b7974bd50c
Author: Xiangdong Huang <hx...@qq.com>
AuthorDate: Wed Apr 24 14:35:36 2019 +0800
close MemMonitor in EnvironmentUtil.cleanEnv() (#164)
---
.travis.yml | 8 ++++++++
.../test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java | 10 +++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 76587ba..ba2a8ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,6 +70,13 @@ matrix:
- java -version
- mvn -version
- mvn -B clean integration-test
+ cache:
+ directories:
+ - '$HOME/.m2/repository'
+ - '$HOME/.sonar/cache'
+ - '/c/java11'
+ - '/c/mvn361'
+
- os: windows
language: c
name: win-oraclejdk8
@@ -88,6 +95,7 @@ matrix:
- java -version
- mvn -version
- mvn -B clean integration-test
+
- os: linux
name: linux-openjdk11
dist: trusty
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 9915699..3f55893 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
@@ -95,11 +95,6 @@ public class EnvironmentUtils {
// FileNodeManager.getInstance().reset();
// reset MemController
BasicMemController.getInstance().close();
- try {
- BasicMemController.getInstance().start();
- } catch (StartupException e) {
- LOGGER.error("", e);
- }
}
private static void cleanAllDir() throws IOException {
@@ -175,5 +170,10 @@ public class EnvironmentUtils {
MultiFileLogNodeManager.getInstance().start();
TEST_QUERY_JOB_ID = QueryResourceManager.getInstance().assignJobId();
TEST_QUERY_CONTEXT = new QueryContext(TEST_QUERY_JOB_ID);
+ try {
+ BasicMemController.getInstance().start();
+ } catch (StartupException e) {
+ LOGGER.error("", e);
+ }
}
}