You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/08/19 06:15:26 UTC
[incubator-iotdb] branch master updated (ac465f4 -> f718837)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from ac465f4 fix start-walchecker scripts for leting user define the wal folder
add 21bd10c add jmx interface for getting the active and pending tasks in FlushManager
add f40c076 add Apache header on FlushManagerMBean.java
add 3311fa0 deregister FlushManager MBean when stop
add f5c0dce merge two homogeneous interfaces (getNumberOfWorkingTasks() of FlushTask Pool)
add bdd129a delete duplicated function
new f718837 Merge pull request #319 from apache/feature_add_flush_queue_jmx_interface
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.
Summary of changes:
.../apache/iotdb/db/engine/flush/FlushManager.java | 33 +++++++++++++++++++++-
.../iotdb/db/engine/flush/FlushManagerMBean.java | 16 ++++++-----
.../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, 54 insertions(+), 13 deletions(-)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java => server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManagerMBean.java (72%)
[incubator-iotdb] 01/01: Merge pull request #319 from
apache/feature_add_flush_queue_jmx_interface
Posted by 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;