[incubator-iotdb] branch fix_422 created (now d8a3d54)

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a change to branch fix_422
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


      at d8a3d54  close files before merge

This branch includes the following new commits:

     new d8a3d54  close files before merge

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[incubator-iotdb] 01/01: close files before merge

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch fix_422
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit d8a3d54caa15c8c13264017ba464d5ddc25b13ad
Author: jt2594838 <jt...@163.com>
AuthorDate: Tue Jan 14 20:34:28 2020 +0800

    close files before merge
---
 .../org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 663a567..4a6037b 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -1297,6 +1297,7 @@ public class StorageGroupProcessor {
         }
         return;
       }
+      waitForAllCurrentTsFileProcessorsClosed();
       if (unSequenceFileList.isEmpty() || sequenceFileTreeSet.isEmpty()) {
         logger.info("{} no files to be merged", storageGroupName);
         return;