You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2021/01/04 00:59:33 UTC
[iotdb] branch master updated (e28208c -> 08400ad)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from e28208c change udf and tracing ut root path to target (#2411)
add 6d25ba5 refactor node management
add d99432a remove a done todo
add 31c4d43 Merge branch 'master' into cluster_node_management
add 44a6155 fix tests
add 0255b85 fix test
add e7b1421 fix no waiting after time_out
add 6f3d021 Merge branch 'master' into cluster_node_management
add 90cc875 fix import
new 08400ad Merge pull request #2359 from apache/cluster_node_management
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:
.../cluster/client/async/AsyncClientPool.java | 79 +++++---------
.../iotdb/cluster/client/sync/SyncClientPool.java | 24 ++++-
.../iotdb/cluster/coordinator/Coordinator.java | 2 +-
.../apache/iotdb/cluster/log/LogDispatcher.java | 4 +-
.../cluster/log/applier/AsyncDataLogApplier.java | 4 +-
.../iotdb/cluster/log/catchup/CatchUpTask.java | 2 +-
.../iotdb/cluster/log/manage/RaftLogManager.java | 2 +-
.../cluster/query/manage/QueryCoordinator.java | 115 ++-------------------
.../iotdb/cluster/server/DataClusterServer.java | 2 +-
.../iotdb/cluster/server/MetaClusterServer.java | 10 ++
.../handlers/caller/AppendNodeEntryHandler.java | 6 +-
.../server/handlers/caller/HeartbeatHandler.java | 2 +-
.../cluster/server/member/DataGroupMember.java | 13 +--
.../cluster/server/member/MetaGroupMember.java | 45 ++++++--
.../iotdb/cluster/server/member/RaftMember.java | 83 ++++++---------
.../cluster/server/{ => monitor}/NodeReport.java | 3 +-
.../manage => server/monitor}/NodeStatus.java | 41 +++++++-
.../monitor/NodeStatusManager.java} | 87 +++++++++-------
.../iotdb/cluster/server/{ => monitor}/Peer.java | 2 +-
.../iotdb/cluster/server/{ => monitor}/Timer.java | 2 +-
.../cluster/server/service/MetaAsyncService.java | 6 ++
.../cluster/server/service/MetaSyncService.java | 5 +
.../cluster/utils/nodetool/ClusterMonitor.java | 2 +-
.../cluster/log/applier/DataLogApplierTest.java | 10 +-
.../iotdb/cluster/log/catchup/CatchUpTaskTest.java | 7 +-
.../cluster/log/catchup/LogCatchUpTaskTest.java | 6 ++
.../log/catchup/SnapshotCatchUpTaskTest.java | 6 ++
.../cluster/log/snapshot/DataSnapshotTest.java | 5 +
.../cluster/log/snapshot/PullSnapshotTaskTest.java | 5 +
.../apache/iotdb/cluster/query/BaseQueryTest.java | 5 +-
.../cluster/query/manage/QueryCoordinatorTest.java | 15 +--
.../caller/AppendNodeEntryHandlerTest.java | 2 +-
.../server/heartbeat/DataHeartbeatThreadTest.java | 5 +
.../server/heartbeat/HeartbeatThreadTest.java | 5 +
.../server/heartbeat/MetaHeartbeatThreadTest.java | 5 +
.../cluster/server/member/DataGroupMemberTest.java | 5 +
.../iotdb/cluster/server/member/MemberTest.java | 9 ++
.../cluster/server/member/MetaGroupMemberTest.java | 14 ++-
thrift/src/main/thrift/cluster.thrift | 7 ++
39 files changed, 343 insertions(+), 309 deletions(-)
rename cluster/src/main/java/org/apache/iotdb/cluster/server/{ => monitor}/NodeReport.java (98%)
rename cluster/src/main/java/org/apache/iotdb/cluster/{query/manage => server/monitor}/NodeStatus.java (59%)
copy cluster/src/main/java/org/apache/iotdb/cluster/{query/manage/QueryCoordinator.java => server/monitor/NodeStatusManager.java} (72%)
rename cluster/src/main/java/org/apache/iotdb/cluster/server/{ => monitor}/Peer.java (97%)
rename cluster/src/main/java/org/apache/iotdb/cluster/server/{ => monitor}/Timer.java (99%)
[iotdb] 01/01: Merge pull request #2359 from
apache/cluster_node_management
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 08400adb0da24fc98a1e4cdd06b30b59f22ffb07
Merge: e28208c 90cc875
Author: Jiang Tian <jt...@163.com>
AuthorDate: Sun Jan 3 16:59:09 2021 -0800
Merge pull request #2359 from apache/cluster_node_management
Refactor cluster node status management
.../cluster/client/async/AsyncClientPool.java | 79 +++++---------
.../iotdb/cluster/client/sync/SyncClientPool.java | 24 ++++-
.../iotdb/cluster/coordinator/Coordinator.java | 2 +-
.../apache/iotdb/cluster/log/LogDispatcher.java | 4 +-
.../cluster/log/applier/AsyncDataLogApplier.java | 4 +-
.../iotdb/cluster/log/catchup/CatchUpTask.java | 2 +-
.../iotdb/cluster/log/manage/RaftLogManager.java | 2 +-
.../cluster/query/manage/QueryCoordinator.java | 115 ++-------------------
.../iotdb/cluster/server/DataClusterServer.java | 2 +-
.../iotdb/cluster/server/MetaClusterServer.java | 10 ++
.../handlers/caller/AppendNodeEntryHandler.java | 6 +-
.../server/handlers/caller/HeartbeatHandler.java | 2 +-
.../cluster/server/member/DataGroupMember.java | 13 +--
.../cluster/server/member/MetaGroupMember.java | 45 ++++++--
.../iotdb/cluster/server/member/RaftMember.java | 83 ++++++---------
.../cluster/server/{ => monitor}/NodeReport.java | 3 +-
.../manage => server/monitor}/NodeStatus.java | 41 +++++++-
.../monitor/NodeStatusManager.java} | 87 +++++++++-------
.../iotdb/cluster/server/{ => monitor}/Peer.java | 2 +-
.../iotdb/cluster/server/{ => monitor}/Timer.java | 2 +-
.../cluster/server/service/MetaAsyncService.java | 6 ++
.../cluster/server/service/MetaSyncService.java | 5 +
.../cluster/utils/nodetool/ClusterMonitor.java | 2 +-
.../cluster/log/applier/DataLogApplierTest.java | 10 +-
.../iotdb/cluster/log/catchup/CatchUpTaskTest.java | 7 +-
.../cluster/log/catchup/LogCatchUpTaskTest.java | 6 ++
.../log/catchup/SnapshotCatchUpTaskTest.java | 6 ++
.../cluster/log/snapshot/DataSnapshotTest.java | 5 +
.../cluster/log/snapshot/PullSnapshotTaskTest.java | 5 +
.../apache/iotdb/cluster/query/BaseQueryTest.java | 5 +-
.../cluster/query/manage/QueryCoordinatorTest.java | 15 +--
.../caller/AppendNodeEntryHandlerTest.java | 2 +-
.../server/heartbeat/DataHeartbeatThreadTest.java | 5 +
.../server/heartbeat/HeartbeatThreadTest.java | 5 +
.../server/heartbeat/MetaHeartbeatThreadTest.java | 5 +
.../cluster/server/member/DataGroupMemberTest.java | 5 +
.../iotdb/cluster/server/member/MemberTest.java | 9 ++
.../cluster/server/member/MetaGroupMemberTest.java | 14 ++-
thrift/src/main/thrift/cluster.thrift | 7 ++
39 files changed, 343 insertions(+), 309 deletions(-)