You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/08/25 12:32:39 UTC
[iotdb] branch beyyes/remove_confignode_develop created (now 1172ea99a5)
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a change to branch beyyes/remove_confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 1172ea99a5 fix the bug that option.get() throws exception
This branch includes the following new commits:
new 345dd7f510 Merge commit 'refs/pull/7089/head' of github.com:apache/iotdb
new db5e52cc9f Merge commit 'refs/pull/7108/head' of github.com:apache/iotdb
new ec14d94098 Merge branch 'master' of github.com:apache/iotdb
new c9a3325c63 Merge branch 'master' of github.com:apache/iotdb
new 57a332bac3 Merge commit 'refs/pull/7108/head' of github.com:apache/iotdb
new 1172ea99a5 fix the bug that option.get() throws exception
The 6 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.
[iotdb] 03/06: Merge branch 'master' of github.com:apache/iotdb
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/remove_confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ec14d940989526a1537e6c4325d9b480f8e6387c
Merge: db5e52cc9f 72a1de7cb8
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Thu Aug 25 10:20:14 2022 +0800
Merge branch 'master' of github.com:apache/iotdb
.../org/apache/iotdb/consensus/IStateMachine.java | 12 +-
.../org/apache/iotdb/consensus/common/Utils.java | 77 ++
.../iotdb/consensus/ratis/SnapshotStorage.java | 51 +-
.../apache/iotdb/consensus/ratis/SnapshotTest.java | 63 +
external-api/pom.xml | 60 +
.../iotdb/external/api/IPropertiesLoader.java | 21 +-
.../iotdb/external/api/ISeriesNumerLimiter.java | 48 +
.../aggregation/IoTDBAggregationScanOrderIT.java | 113 ++
.../db/integration/sync/IoTDBSyncReceiverIT.java | 6 +-
.../db/integration/sync/IoTDBSyncSenderIT.java | 13 +-
...ortClientMock.java => MockTransportClient.java} | 42 +-
.../db/integration/sync/TransportHandlerMock.java | 58 -
.../apache/iotdb/commons/conf/IoTDBConstant.java | 4 +
.../apache/iotdb/commons/sync/SyncConstant.java | 2 +
pom.xml | 3 +
server/pom.xml | 5 +
.../resources/conf/iotdb-datanode.properties | 25 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 31 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 1388 ++++++++++----------
.../statemachine/DataRegionStateMachine.java | 6 +-
.../metadata/SeriesNumberOverflowException.java} | 28 +-
.../db/metadata/schemaregion/SchemaEngine.java | 30 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 104 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 87 +-
.../db/protocol/mqtt/PayloadFormatManager.java | 13 +-
.../db/query/executor/AggregationExecutor.java | 4 +
.../java/org/apache/iotdb/db/service/IoTDB.java | 5 +
.../java/org/apache/iotdb/db/service/NewIoTDB.java | 5 +
.../service/thrift/impl/ClientRPCServiceImpl.java | 10 +-
.../db/service/thrift/impl/TSServiceImpl.java | 10 +-
.../java/org/apache/iotdb/db/sync/SyncService.java | 49 +-
.../iotdb/db/sync/common/ISyncInfoFetcher.java | 2 +-
.../iotdb/db/sync/common/LocalSyncInfoFetcher.java | 2 +-
.../org/apache/iotdb/db/sync/common/SyncInfo.java | 2 +-
.../db/sync/common/persistence/SyncLogReader.java | 2 +-
.../db/sync/common/persistence/SyncLogWriter.java | 2 +-
.../manager => sender/pipe}/PipeMessage.java | 2 +-
.../db/sync/sender/service/TransportHandler.java | 126 --
.../db/sync/transport/client/ClientWrapper.java | 124 --
.../db/sync/transport/client/ITransportClient.java | 23 +-
.../transport/client/IoTDBSinkTransportClient.java | 450 ++-----
.../db/sync/transport/client/SenderManager.java | 120 ++
.../transport/client/TransportClientFactory.java | 68 +
.../db/sync/transport/server/ReceiverManager.java | 323 ++---
.../org/apache/iotdb/db/utils/JarLoaderUtil.java | 150 +++
.../db/sync/receiver/manager/SyncInfoTest.java | 1 +
.../db/sync/receiver/recovery/SyncLogTest.java | 2 +-
.../iotdb/db/sync/transport/SyncTransportTest.java | 173 ++-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 3 +-
thrift/src/main/thrift/client.thrift | 17 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 2 +-
51 files changed, 2216 insertions(+), 1751 deletions(-)
[iotdb] 04/06: Merge branch 'master' of github.com:apache/iotdb
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/remove_confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c9a3325c63d569ac1db7ea1a79da93a573f90bc5
Merge: ec14d94098 94657cf836
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Thu Aug 25 12:07:31 2022 +0800
Merge branch 'master' of github.com:apache/iotdb
.../db/integration/sync/IoTDBSyncReceiverIT.java | 6 ++---
.../db/integration/sync/IoTDBSyncSenderIT.java | 28 +++++++++++-----------
...ockTransportClient.java => MockSyncClient.java} | 6 ++---
.../dataregion/StorageGroupManager.java | 5 ++--
.../db/mpp/execution/exchange/SinkHandle.java | 28 +++++++++++++++-------
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 2 +-
.../org/apache/iotdb/db/sync/sender/pipe/Pipe.java | 18 +++++++-------
.../{ITransportClient.java => ISyncClient.java} | 2 +-
...nkTransportClient.java => IoTDBSyncClient.java} | 6 ++---
.../db/sync/transport/client/SenderManager.java | 14 +++++------
...rtClientFactory.java => SyncClientFactory.java} | 8 +++----
.../iotdb/db/sync/transport/SyncTransportTest.java | 8 +++----
12 files changed, 71 insertions(+), 60 deletions(-)
[iotdb] 01/06: Merge commit 'refs/pull/7089/head' of github.com:apache/iotdb
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/remove_confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 345dd7f510e341142a1433100dd70048a887b41d
Merge: 6be3aad27a f0bb4f7601
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Wed Aug 24 16:26:03 2022 +0800
Merge commit 'refs/pull/7089/head' of github.com:apache/iotdb
.../java/org/apache/iotdb/confignode/manager/PartitionManager.java | 7 +++++++
.../iotdb/confignode/manager/load/heartbeat/IRegionGroupCache.java | 7 +++++++
.../iotdb/confignode/manager/load/heartbeat/RegionGroupCache.java | 7 +++++++
3 files changed, 21 insertions(+)
[iotdb] 06/06: fix the bug that option.get() throws exception
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/remove_confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1172ea99a56e8758566561d64c5a7ebb6b1c984a
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Thu Aug 25 20:32:17 2022 +0800
fix the bug that option.get() throws exception
---
.../sync/confignode/SyncConfigNodeClientPool.java | 7 ++--
.../sync/datanode/SyncDataNodeClientPool.java | 2 +-
.../confignode/conf/ConfigNodeRemoveCheck.java | 6 ++--
.../confignode/conf/ConfigNodeStartupCheck.java | 38 +++++++++++-----------
.../confignode/service/ConfigNodeCommandLine.java | 5 ++-
5 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/confignode/SyncConfigNodeClientPool.java b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/confignode/SyncConfigNodeClientPool.java
index a596b7e9f0..44366c1b57 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/confignode/SyncConfigNodeClientPool.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/confignode/SyncConfigNodeClientPool.java
@@ -101,11 +101,8 @@ public class SyncConfigNodeClientPool {
}
}
LOGGER.error("{} failed on ConfigNode {}", requestType, endPoint, lastException);
- switch (requestType) {
- default:
- return RpcUtils.getStatus(
- TSStatusCode.ALL_RETRY_FAILED, "All retry failed due to" + lastException.getMessage());
- }
+ return RpcUtils.getStatus(
+ TSStatusCode.ALL_RETRY_FAILED, "All retry failed due to " + lastException.getMessage());
}
/**
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/datanode/SyncDataNodeClientPool.java b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/datanode/SyncDataNodeClientPool.java
index 690acb8e90..0c85ffda88 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/datanode/SyncDataNodeClientPool.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/datanode/SyncDataNodeClientPool.java
@@ -110,7 +110,7 @@ public class SyncDataNodeClientPool {
}
LOGGER.error("{} failed on DataNode {}", requestType, endPoint, lastException);
return new TSStatus(TSStatusCode.ALL_RETRY_FAILED.getStatusCode())
- .setMessage("All retry failed due to" + lastException.getMessage());
+ .setMessage("All retry failed due to: " + lastException.getMessage());
}
public void deleteRegions(Set<TRegionReplicaSet> deletedRegionSet) {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
index 894e712374..79206ce654 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
@@ -39,14 +39,14 @@ import java.util.Properties;
public class ConfigNodeRemoveCheck {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNodeStartupCheck.class);
- private static final ConfigNodeConfig conf = ConfigNodeDescriptor.getInstance().getConf();
+ private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
private final File systemPropertiesFile;
private final Properties systemProperties;
public ConfigNodeRemoveCheck() {
systemPropertiesFile =
- new File(conf.getSystemDir() + File.separator + ConfigNodeConstant.SYSTEM_FILE_NAME);
+ new File(CONF.getSystemDir() + File.separator + ConfigNodeConstant.SYSTEM_FILE_NAME);
systemProperties = new Properties();
}
@@ -62,7 +62,7 @@ public class ConfigNodeRemoveCheck {
getConfigNodeList().stream()
.filter(e -> e.getInternalEndPoint().equals(endPoint))
.findFirst()
- .get();
+ .orElse(null);
} catch (IOException | BadNodeUrlException e) {
LOGGER.error("Load system properties file failed.", e);
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
index 73c1f5ab20..4afab64920 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
@@ -38,7 +38,7 @@ public class ConfigNodeStartupCheck {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNodeStartupCheck.class);
- private static final ConfigNodeConfig conf = ConfigNodeDescriptor.getInstance().getConf();
+ private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
public void startUpCheck() throws StartupException, IOException, ConfigurationException {
checkGlobalConfig();
@@ -52,60 +52,60 @@ public class ConfigNodeStartupCheck {
private void checkGlobalConfig() throws ConfigurationException {
// When the ConfigNode consensus protocol is set to StandAlone,
// the target_config_nodes needs to point to itself
- if (conf.getConfigNodeConsensusProtocolClass().equals(ConsensusFactory.StandAloneConsensus)
- && (!conf.getInternalAddress().equals(conf.getTargetConfigNode().getIp())
- || conf.getInternalPort() != conf.getTargetConfigNode().getPort())) {
+ if (CONF.getConfigNodeConsensusProtocolClass().equals(ConsensusFactory.StandAloneConsensus)
+ && (!CONF.getInternalAddress().equals(CONF.getTargetConfigNode().getIp())
+ || CONF.getInternalPort() != CONF.getTargetConfigNode().getPort())) {
throw new ConfigurationException(
IoTDBConstant.TARGET_CONFIG_NODES,
- conf.getTargetConfigNode().getIp() + ":" + conf.getTargetConfigNode().getPort(),
- conf.getInternalAddress() + ":" + conf.getInternalPort());
+ CONF.getTargetConfigNode().getIp() + ":" + CONF.getTargetConfigNode().getPort(),
+ CONF.getInternalAddress() + ":" + CONF.getInternalPort());
}
// When the data region consensus protocol is set to StandAlone,
// the data replication factor must be 1
- if (conf.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.StandAloneConsensus)
- && conf.getDataReplicationFactor() != 1) {
+ if (CONF.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.StandAloneConsensus)
+ && CONF.getDataReplicationFactor() != 1) {
throw new ConfigurationException(
"data_replication_factor",
- String.valueOf(conf.getDataReplicationFactor()),
+ String.valueOf(CONF.getDataReplicationFactor()),
String.valueOf(1));
}
// When the schema region consensus protocol is set to StandAlone,
// the schema replication factor must be 1
- if (conf.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.StandAloneConsensus)
- && conf.getSchemaReplicationFactor() != 1) {
+ if (CONF.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.StandAloneConsensus)
+ && CONF.getSchemaReplicationFactor() != 1) {
throw new ConfigurationException(
"schema_replication_factor",
- String.valueOf(conf.getSchemaReplicationFactor()),
+ String.valueOf(CONF.getSchemaReplicationFactor()),
String.valueOf(1));
}
// When the schema region consensus protocol is set to MultiLeaderConsensus,
// we should report an error
- if (conf.getSchemaRegionConsensusProtocolClass()
+ if (CONF.getSchemaRegionConsensusProtocolClass()
.equals(ConsensusFactory.MultiLeaderConsensus)) {
throw new ConfigurationException(
"schema_region_consensus_protocol_class",
- String.valueOf(conf.getSchemaRegionConsensusProtocolClass()),
+ String.valueOf(CONF.getSchemaRegionConsensusProtocolClass()),
String.format(
"%s or %s", ConsensusFactory.StandAloneConsensus, ConsensusFactory.RatisConsensus));
}
- if (!conf.getRoutingPolicy().equals(RouteBalancer.LEADER_POLICY)
- && !conf.getRoutingPolicy().equals(RouteBalancer.GREEDY_POLICY)) {
+ if (!CONF.getRoutingPolicy().equals(RouteBalancer.LEADER_POLICY)
+ && !CONF.getRoutingPolicy().equals(RouteBalancer.GREEDY_POLICY)) {
throw new ConfigurationException(
- "routing_policy", conf.getRoutingPolicy(), "leader or greedy");
+ "routing_policy", CONF.getRoutingPolicy(), "leader or greedy");
}
}
private void createDirsIfNecessary() throws IOException {
// If systemDir does not exist, create systemDir
- File systemDir = new File(conf.getSystemDir());
+ File systemDir = new File(CONF.getSystemDir());
createDirIfEmpty(systemDir);
// If consensusDir does not exist, create consensusDir
- File consensusDir = new File(conf.getConsensusDir());
+ File consensusDir = new File(CONF.getConsensusDir());
createDirIfEmpty(consensusDir);
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java
index ae36f91a92..ef4dc7a951 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java
@@ -87,6 +87,9 @@ public class ConfigNodeCommandLine extends ServerCommandLine {
LOGGER.error("Meet error when doing remove", e);
return -1;
}
+ } else {
+ LOGGER.error("Unsupported startup mode: {}", mode);
+ return -1;
}
return 0;
@@ -104,7 +107,7 @@ public class ConfigNodeCommandLine extends ServerCommandLine {
TConfigNodeLocation removeConfigNodeLocation =
ConfigNodeRemoveCheck.getInstance().removeCheck(endPoint);
if (removeConfigNodeLocation == null) {
- LOGGER.error("The ConfigNode not in the Cluster.");
+ LOGGER.error("The ConfigNode to be removed is not in the Cluster.");
return;
}
[iotdb] 02/06: Merge commit 'refs/pull/7108/head' of github.com:apache/iotdb
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/remove_confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit db5e52cc9fdddb04219be57f01f56e71a0ca909a
Merge: 345dd7f510 b13de62901
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Wed Aug 24 16:36:58 2022 +0800
Merge commit 'refs/pull/7108/head' of github.com:apache/iotdb
.../iotdb/confignode/manager/load/LoadManager.java | 24 +++++------
.../manager/load/balancer/RouteBalancer.java | 8 +++-
.../load/balancer/router/LazyGreedyRouter.java | 26 ++++++------
.../manager/load/heartbeat/BaseNodeCache.java | 6 +--
.../load/heartbeat/ConfigNodeHeartbeatCache.java | 14 ++-----
.../load/heartbeat/DataNodeHeartbeatCache.java | 47 ++++++----------------
.../load/heartbeat/NodeHeartbeatSample.java | 29 ++++++++++++-
.../load/balancer/router/LazyGreedyRouterTest.java | 4 +-
.../load/balancer/router/LeaderRouterTest.java | 2 +-
.../balancer/router/LoadScoreGreedyRouterTest.java | 2 +-
.../apache/iotdb/commons/cluster/NodeStatus.java | 11 ++++-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 17 ++++----
.../org/apache/iotdb/db/conf/SystemStatus.java | 32 ---------------
.../db/conf/directories/DirectoryManager.java | 6 +--
.../iotdb/db/conf/directories/FolderManager.java | 6 +--
.../directories/strategy/DirectoryStrategy.java | 4 +-
.../compaction/task/CompactionRecoverTask.java | 4 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 6 +--
.../db/engine/storagegroup/TsFileProcessor.java | 6 +--
.../iotdb/db/metadata/logfile/MLogWriter.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 4 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 1 +
.../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 8 ++--
.../iotdb/db/wal/checkpoint/CheckpointManager.java | 6 +--
.../apache/iotdb/db/utils/EnvironmentUtils.java | 4 +-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 1 -
thrift/src/main/thrift/datanode.thrift | 7 ++--
27 files changed, 134 insertions(+), 155 deletions(-)
[iotdb] 05/06: Merge commit 'refs/pull/7108/head' of github.com:apache/iotdb
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/remove_confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 57a332bac391353284583ab70141b9f480f989d6
Merge: c9a3325c63 c842c317b0
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Thu Aug 25 12:14:28 2022 +0800
Merge commit 'refs/pull/7108/head' of github.com:apache/iotdb
.../async/handlers/DataNodeHeartbeatHandler.java | 2 +-
.../load/heartbeat/ConfigNodeHeartbeatCache.java | 19 +++----------------
.../load/heartbeat/DataNodeHeartbeatCache.java | 4 +++-
.../load/balancer/router/LeaderRouterTest.java | 6 +++++-
.../balancer/router/LoadScoreGreedyRouterTest.java | 6 +++++-
.../org/apache/iotdb/commons/cluster/NodeStatus.java | 5 +++++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../thrift/impl/DataNodeInternalRPCServiceImpl.java | 2 +-
.../org/apache/iotdb/spark/db/EnvironmentUtils.java | 3 ++-
9 files changed, 26 insertions(+), 23 deletions(-)