[incubator-iotdb] branch ut_close_socket updated: try to fix 8181 port not closed successful

[hxd]

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 d0b2b63  try to fix 8181 port not closed successful
d0b2b63 is described below

commit d0b2b639d88fd355a11c51781a8e67456d4f4182
Author: xiangdong huang <saint...@gmail.com>
AuthorDate: Tue Feb 18 16:49:46 2020 +0800

    try to fix 8181 port not closed successful
---
 hadoop/src/test/resources/logback.xml                               | 2 +-
 {hadoop => hive-connector}/src/test/resources/logback.xml           | 6 ++----
 server/src/main/java/org/apache/iotdb/db/service/JMXService.java    | 2 +-
 .../src/main/java/org/apache/iotdb/db/service/MetricsService.java   | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/hadoop/src/test/resources/logback.xml 
b/hadoop/src/test/resources/logback.xml
index 5d4d57c..ac3fcb3 100644
--- a/hadoop/src/test/resources/logback.xml
+++ b/hadoop/src/test/resources/logback.xml
@@ -35,7 +35,7 @@
     </appender>
     <!--<logger name="org.apache.iotdb.db.utils.OpenFileNumUtil" level="debug" 
/>-->
     <!--<logger name="org.apache.iotdb.db.utils.OpenFileNumUtilTest" 
level="debug" />-->
-    <root level="INFO">
+    <root level="WARN">
         <appender-ref ref="stdout"/>
     </root>
 </configuration>
diff --git a/hadoop/src/test/resources/logback.xml 
b/hive-connector/src/test/resources/logback.xml
similarity index 86%
copy from hadoop/src/test/resources/logback.xml
copy to hive-connector/src/test/resources/logback.xml
index 5d4d57c..03cba5f 100644
--- a/hadoop/src/test/resources/logback.xml
+++ b/hive-connector/src/test/resources/logback.xml
@@ -30,12 +30,10 @@
             <charset>utf-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>DEBUG</level>
+            <level>INFO</level>
         </filter>
     </appender>
-    <!--<logger name="org.apache.iotdb.db.utils.OpenFileNumUtil" level="debug" 
/>-->
-    <!--<logger name="org.apache.iotdb.db.utils.OpenFileNumUtilTest" 
level="debug" />-->
-    <root level="INFO">
+    <root level="WARN">
         <appender-ref ref="stdout"/>
     </root>
 </configuration>
diff --git a/server/src/main/java/org/apache/iotdb/db/service/JMXService.java 
b/server/src/main/java/org/apache/iotdb/db/service/JMXService.java
index a0e564b..b12aceb 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/JMXService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/JMXService.java
@@ -111,7 +111,7 @@ public class JMXService implements IService {
 
     if (jmxPort == null) {
       localOnly = true;
-      jmxPort = System.getProperty(IoTDBConstant.IOTDB_LOCAL_JMX_PORT_NAME);
+      jmxPort = System.getProperty(IoTDBConstant.IOTDB_LOCAL_JMX_PORT_NAME, 
"31999");
     }
 
     if (jmxPort == null) {
diff --git 
a/server/src/main/java/org/apache/iotdb/db/service/MetricsService.java 
b/server/src/main/java/org/apache/iotdb/db/service/MetricsService.java
index 9561e47..b087f2e 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/MetricsService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/MetricsService.java
@@ -88,6 +88,7 @@ public class MetricsService implements MetricsServiceMBean, 
IService {
     metricsWebUI.getHandlers().add(metricsSystem.getServletHandlers());
     metricsWebUI.initialize();
     server = metricsWebUI.getServer(port);
+    server.setStopTimeout(5000);
     metricsSystem.start();
     try {
       executorService.execute(new MetricsServiceThread(server));
@@ -132,7 +133,6 @@ public class MetricsService implements MetricsServiceMBean, 
IService {
           .error("{}: close {} failed because {}", 
IoTDBConstant.GLOBAL_DB_NAME, getID().getName(),
               e);
       executorService.shutdownNow();
-      Thread.currentThread().interrupt();
     }
     checkAndWaitPortIsClosed();
     logger.warn("{}: close {} successfully", IoTDBConstant.GLOBAL_DB_NAME, 
this.getID().getName());
@@ -185,7 +185,6 @@ public class MetricsService implements MetricsServiceMBean, 
IService {
       } catch (@SuppressWarnings("squid:S2142") InterruptedException e1) {
         //we do not sure why InterruptedException happens, but it indeed 
occurs in Travis WinOS
         logger.error(e1.getMessage(), e1);
-        stopService();
       } catch (Exception e) {
         logger.error("{}: failed to start {}, because ", 
IoTDBConstant.GLOBAL_DB_NAME, getID().getName(), e);
       }