[incubator-iotdb] branch ut_close_socket updated: for debug

[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 aa829e4  for debug
aa829e4 is described below

commit aa829e46b49eaea77899a3548cedd081a1aa9e69
Author: xiangdong huang <saint...@gmail.com>
AuthorDate: Wed Feb 19 17:24:43 2020 +0800

    for debug
---
 .../java/org/apache/iotdb/db/query/control/FileReaderManager.java  | 2 ++
 .../src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java  | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java 
b/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
index c961a64..d52d4c9 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
@@ -198,11 +198,13 @@ public class FileReaderManager implements IService {
   public synchronized void closeAndRemoveAllOpenedReaders() throws IOException 
{
     for (Map.Entry<TsFileResource, TsFileSequenceReader> entry : 
closedFileReaderMap.entrySet()) {
       entry.getValue().close();
+      logger.error("{} closedTsFileReader is closed.", 
entry.getValue().getFileName());
       closedReferenceMap.remove(entry.getKey());
       closedFileReaderMap.remove(entry.getKey());
     }
     for (Map.Entry<TsFileResource, TsFileSequenceReader> entry : 
unclosedFileReaderMap.entrySet()) {
       entry.getValue().close();
+      logger.error("{} unclosedTsFileReader is closed.", 
entry.getValue().getFileName());
       unclosedReferenceMap.remove(entry.getKey());
       unclosedFileReaderMap.remove(entry.getKey());
     }
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 965ffbe..0b745fb 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
@@ -81,6 +81,10 @@ public class EnvironmentUtils {
       daemon.stop();
       daemon = null;
     }
+    QueryResourceManager.getInstance().endQuery(TEST_QUERY_JOB_ID);
+    // clear opened file streams
+    FileReaderManager.getInstance().closeAndRemoveAllOpenedReaders();
+
     TTransport transport = new TSocket("127.0.0.1", 6667, 100);
     if (!transport.isOpen()) {
       try {
@@ -119,9 +123,6 @@ public class EnvironmentUtils {
     } catch (Exception e) {
       //do nothing
     }
-    QueryResourceManager.getInstance().endQuery(TEST_QUERY_JOB_ID);
-    // clear opened file streams
-    FileReaderManager.getInstance().closeAndRemoveAllOpenedReaders();
 
     // clean storage group manager
     if (!StorageEngine.getInstance().deleteAll()) {