[incubator-iotdb] branch new_series_reader_tsfileprocessor_test updated: add log for dev

[hx...@apache.org]

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

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


The following commit(s) were added to refs/heads/new_series_reader_tsfileprocessor_test by this push:
     new 29fea83  add log for dev
29fea83 is described below

commit 29fea834586bbe72bea50f8c4d26dd705d0f194c
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Fri Feb 21 19:21:43 2020 +0800

    add log for dev
---
 .../java/org/apache/iotdb/db/engine/flush/FlushManager.java    | 10 +++++++---
 .../apache/iotdb/db/engine/storagegroup/TsFileProcessor.java   |  4 ++++
 .../iotdb/db/engine/storagegroup/TsFileProcessorTest.java      |  3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
index 0bc23ab..4dd3ec8 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
@@ -88,6 +88,7 @@ public class FlushManager implements FlushManagerMBean, IService {
       TsFileProcessor tsFileProcessor = tsFileProcessorQueue.poll();
       tsFileProcessor.flushOneMemTable();
       tsFileProcessor.setManagedByFlushManager(false);
+      logger.error("Flush Thread re-register TSProcessor {} to the queue.", tsFileProcessor.getStorageGroupName());
       registerTsFileProcessor(tsFileProcessor);
     }
   }
@@ -99,13 +100,16 @@ public class FlushManager implements FlushManagerMBean, IService {
   public void registerTsFileProcessor(TsFileProcessor tsFileProcessor) {
     synchronized (tsFileProcessor) {
       if (!tsFileProcessor.isManagedByFlushManager() && tsFileProcessor.getFlushingMemTableSize() > 0) {
-        logger.info("storage group {} begin to submit a flush thread, flushing memtable size: {}",
-            tsFileProcessor.getStorageGroupName(), tsFileProcessor.getFlushingMemTableSize());
         tsFileProcessorQueue.add(tsFileProcessor);
+        logger.info("storage group {} begin to submit a flush thread, flushing memtable size: {}, queue size: {}",
+            tsFileProcessor.getStorageGroupName(), tsFileProcessor.getFlushingMemTableSize(), tsFileProcessorQueue.size());
         tsFileProcessor.setManagedByFlushManager(true);
         flushPool.submit(new FlushThread());
+      } else if (tsFileProcessor.isManagedByFlushManager()){
+        logger.info("tsFileProcessor {} is already in the flushPool, the first one: {}", tsFileProcessor.getStorageGroupName(),
+            tsFileProcessorQueue.getFirst().getStorageGroupName());
       } else {
-        logger.info("tsFileProcessor {} is already in the flushPool", tsFileProcessor.getStorageGroupName());
+        logger.info("No flushing memetable to do, register TsProcessor {} failed.", tsFileProcessor.getStorageGroupName());
       }
     }
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index 72ce1c7..c5eb331 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -440,6 +440,10 @@ public class TsFileProcessor {
         logger.warn(
             "put the memtable (signal={}) out of flushingMemtables but it is not in the queue.",
             memTable.isSignalMemTable());
+      } else {
+        logger.warn(
+            "memtable (signal={}) is removed from the queue. {} left.",
+            memTable.isSignalMemTable(), flushingMemTables.size());
       }
       memTable.release();
       MemTablePool.getInstance().putBack(memTable, storageGroupName);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
index cf243d1..66ffacd 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
@@ -167,7 +167,7 @@ public class TsFileProcessorTest {
         assertEquals(num, timeValuePair.getValue().getInt());
       }
     }
-
+    logger.error("syncFlush..");
     // flush synchronously
     processor.syncFlush();
 
@@ -197,6 +197,7 @@ public class TsFileProcessorTest {
       }
     }
     restorableTsFileIOWriter.close();
+    logger.error("syncClose..");
     processor.syncClose();
   }