[incubator-iotdb] 01/01: Merge pull request #319 from apache/feature_add_flush_queue_jmx_interface

[qi...@apache.org]

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

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

commit f71883756a5d8e865d34101ef66b2c4cc6a90857
Merge: ac465f4 bdd129a
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Mon Aug 19 14:15:22 2019 +0800

    Merge pull request #319 from apache/feature_add_flush_queue_jmx_interface
    
    add jmx interface for getting the active and pending tasks in FlushManager

 .../apache/iotdb/db/engine/flush/FlushManager.java | 33 +++++++++++++++++++++-
 .../iotdb/db/engine/flush/FlushManagerMBean.java   | 32 +++++++++++++++++++++
 .../db/engine/flush/pool/AbstractPoolManager.java  |  5 ++--
 .../engine/flush/pool/FlushSubTaskPoolManager.java |  1 -
 .../db/engine/flush/pool/FlushTaskPoolManager.java |  1 +
 .../org/apache/iotdb/db/service/ServiceType.java   |  9 +++++-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  2 +-
 7 files changed, 77 insertions(+), 6 deletions(-)

diff --cc server/src/main/java/org/apache/iotdb/db/service/ServiceType.java
index 0e981cb,b2f245b..7104763
--- a/server/src/main/java/org/apache/iotdb/db/service/ServiceType.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/ServiceType.java
@@@ -32,9 -32,10 +32,11 @@@ public enum ServiceType 
    FILE_READER_MANAGER_SERVICE("File reader manager ServerService", ""),
    SYNC_SERVICE("SYNC ServerService", ""),
    PERFORMANCE_STATISTIC_SERVICE("PERFORMANCE_STATISTIC_SERVICE","PERFORMANCE_STATISTIC_SERVICE"),
 +  MANAGE_DYNAMIC_PARAMETERS_SERVICE("Manage Dynamic Parameters", "Manage Dynamic Parameters"),
    TVLIST_ALLOCATOR_SERVICE("TVList Allocator", ""),
-   FLUSH_SERVICE("Flush ServerService", "");
+ 
+   FLUSH_SERVICE("Flush ServerService",
+       generateJmxName("org.apache.iotdb.db.engine.pool", "Flush Manager"));
  
    private String name;
    private String jmxName;