This is an automated email from the ASF dual-hosted git repository.
yuyuankang pushed a change to branch kyy
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from d9337c3 cast
add 30f42ff clear service map after rebuilding datagroups to avoid read
old leader from old datamember which may be wrong
add f59469c split the heartbeat port with the data port
add 5e20824 bug fix
add c38d67a bug fix
add 23f7771 add some annotation
add 2c5dbcb fix bug test
add 20bed6b fix review
add db5d959 remove blank lines
add 93dd1ee Merge pull request #1512 from
neuyilan/apache_cluster_new_split_port
add 71db0f0 Merge branch 'cluster_new' into cluster_new_timeout_bug
add b6484ce Merge pull request #1525 from LebronAl/cluster_new_timeout_bug
add c204aec update service map when adding nodes
add aa428a6 change default ports
add 21a0740 [IOTDB-805] Fix BufferUnderflowException when querying TsFile
stored in HDFS (#1519)
add 0d4492c add vm level test and fix bug (#1522)
add 7c5cfb1 Merge branch 'master' into cluster_new
add 2f662dc block thrift disconnection log
add 72ac087 fix client leak
add 504b1d5 fix meta heartbeat port
add f58b217 Merge branch 'cluster_new' of
https://github.com/apache/incubator-iotdb into cluster_new
add f516442 fix conflict
No new revisions were added by this update.
Summary of changes:
.../resources/conf/iotdb-cluster.properties | 7 +-
.../resources/conf/iotdb-engine.properties | 2 +
cluster/src/assembly/resources/conf/logback.xml | 1 +
.../cluster/client/async/AsyncClientPool.java | 31 ++--
.../cluster/client/async/AsyncDataClient.java | 21 ++-
...taClient.java => AsyncDataHeartbeatClient.java} | 66 ++++-----
.../cluster/client/async/AsyncMetaClient.java | 21 ++-
...taClient.java => AsyncMetaHeartbeatClient.java} | 62 +++-----
...etaClient.java => SyncDataHeartbeatClient.java} | 47 +++----
...etaClient.java => SyncMetaHeartbeatClient.java} | 48 +++----
.../apache/iotdb/cluster/config/ClusterConfig.java | 2 +-
.../iotdb/cluster/log/manage/RaftLogManager.java | 4 +-
.../iotdb/cluster/query/reader/DataSourceInfo.java | 2 +-
.../iotdb/cluster/server/DataClusterServer.java | 4 +
.../iotdb/cluster/server/MetaClusterServer.java | 4 +
.../server/heartbeat/DataHeartbeatServer.java | 82 +++++++++++
.../HeartbeatServer.java} | 156 +++++++++------------
.../cluster/server/heartbeat/HeartbeatThread.java | 14 +-
.../server/heartbeat/MetaHeartbeatServer.java | 83 +++++++++++
.../cluster/server/member/DataGroupMember.java | 31 ++--
.../cluster/server/member/MetaGroupMember.java | 18 ++-
.../iotdb/cluster/server/member/RaftMember.java | 80 ++++++++++-
.../apache/iotdb/cluster/utils/ClusterUtils.java | 16 ++-
.../server/heartbeat/DataHeartbeatThreadTest.java | 5 +
.../server/heartbeat/HeartbeatThreadTest.java | 5 +
.../server/heartbeat/MetaHeartbeatThreadTest.java | 5 +
.../cluster/server/member/MetaGroupMemberTest.java | 66 ++++++++-
.../apache/iotdb/hadoop/fileSystem/HDFSOutput.java | 3 +-
.../engine/storagegroup/StorageGroupProcessor.java | 15 +-
.../db/engine/storagegroup/TsFileProcessor.java | 26 +++-
.../writelog/recover/TsFileRecoverPerformer.java | 3 +-
.../storagegroup/TsFileProcessorEnableVmTest.java | 7 +
.../fileOutputFactory/HDFSOutputFactory.java | 3 +-
.../tsfile/fileSystem/fsFactory/HDFSFactory.java | 12 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 8 +-
.../write/writer/ForceAppendTsFileWriter.java | 3 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 9 +-
37 files changed, 670 insertions(+), 302 deletions(-)
copy
cluster/src/main/java/org/apache/iotdb/cluster/client/async/{AsyncDataClient.java
=> AsyncDataHeartbeatClient.java} (67%)
copy
cluster/src/main/java/org/apache/iotdb/cluster/client/async/{AsyncDataClient.java
=> AsyncMetaHeartbeatClient.java} (69%)
copy
cluster/src/main/java/org/apache/iotdb/cluster/client/sync/{SyncMetaClient.java
=> SyncDataHeartbeatClient.java} (55%)
copy
cluster/src/main/java/org/apache/iotdb/cluster/client/sync/{SyncMetaClient.java
=> SyncMetaHeartbeatClient.java} (55%)
create mode 100644
cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatServer.java
copy cluster/src/main/java/org/apache/iotdb/cluster/server/{RaftServer.java =>
heartbeat/HeartbeatServer.java} (61%)
create mode 100644
cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatServer.java
