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 2020/02/18 02:43:03 UTC
[incubator-iotdb] branch ut_close_socket updated: remove unused
daemon in IT
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch ut_close_socket
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/ut_close_socket by this push:
new 2e8fe37 remove unused daemon in IT
2e8fe37 is described below
commit 2e8fe371f12f605f07ce75153782a13b21f1bbbb
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Feb 18 10:42:44 2020 +0800
remove unused daemon in IT
---
.../org/apache/iotdb/db/integration/IoTDBDisableAlignIT.java | 6 +-----
.../test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java | 10 ++++++++++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDisableAlignIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDisableAlignIT.java
index dc85e7a..2f0b2f4 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDisableAlignIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDisableAlignIT.java
@@ -31,8 +31,7 @@ import java.sql.*;
import static org.junit.Assert.fail;
public class IoTDBDisableAlignIT {
-
- private static IoTDB daemon;
+
private static String[] sqls = new String[]{
"SET STORAGE GROUP TO root.vehicle",
@@ -101,8 +100,6 @@ public class IoTDBDisableAlignIT {
@BeforeClass
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -111,7 +108,6 @@ public class IoTDBDisableAlignIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
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 d5183c3..256ee89 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
@@ -90,6 +90,16 @@ public class EnvironmentUtils {
} catch (TTransportException e) {
}
}
+ //try sync service
+ transport = new TSocket("127.0.0.1", 5555, 100);
+ if (!transport.isOpen()) {
+ try {
+ transport.open();
+ logger.error("stop Sync daemon failed. 5555 can be connected now.");
+ transport.close();
+ } catch (TTransportException e) {
+ }
+ }
//try jmx connection
try {
JMXServiceURL url =