[incubator-iotdb] branch dev_new_merge_strategy updated: fix failed merge condition

[ji...@apache.org]

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

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


The following commit(s) were added to refs/heads/dev_new_merge_strategy by this push:
     new cb4609a  fix failed merge condition
cb4609a is described below

commit cb4609a3953645f5408276791ac23c1ab2e30725
Author: jt2594838 <jt...@163.com>
AuthorDate: Sat Nov 23 00:13:54 2019 +0800

    fix failed merge condition
---
 .../org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 df1bb85..d3e3c24 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
@@ -1205,7 +1205,7 @@ public class StorageGroupProcessor {
       File mergeLog, TsFileResource newFile) {
     logger.info("{} a merge task is ending...", storageGroupName);
 
-    if (unseqFiles.isEmpty()) {
+    if (seqFiles.isEmpty() && unseqFiles.isEmpty()) {
       // merge runtime exception arose, just end this merge
       mergeLock.writeLock().lock();
       try {