This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch change_rpc_port in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit db3e595a36088abe1df7a635144a4b41bbf589c1 Merge: b866328 e28208c Author: xiangdong huang <[email protected]> AuthorDate: Sat Jan 2 23:56:00 2021 +0800 Merge remote-tracking branch 'origin/master' into change_rpc_port .../java/org/apache/iotdb/cluster/ClusterMain.java | 20 +- .../Ecosystem Integration/Zeppelin-IoTDB.md | 20 +- .../Operation Manual/UDF User Defined Function.md | 56 ++++-- docs/zh/UserGuide/Client/Command Line Interface.md | 2 +- .../Ecosystem Integration/Zeppelin-IoTDB.md | 20 +- .../Operation Manual/UDF User Defined Function.md | 58 ++++-- .../resources/conf/iotdb-engine.properties | 14 ++ .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 13 ++ .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +- .../engine/storagegroup/StorageGroupProcessor.java | 2 +- .../db/engine/storagegroup/TsFileProcessor.java | 19 +- .../org/apache/iotdb/db/metadata/MManager.java | 8 + .../org/apache/iotdb/db/query/udf/api/UDF.java | 15 ++ .../org/apache/iotdb/db/query/udf/api/UDTF.java | 10 +- .../parameter/UDFParameterValidator.java | 209 +++++++++++++++++++++ .../api/customizer/parameter/UDFParameters.java | 4 + .../UDFAttributeNotProvidedException.java} | 56 +++--- .../api/{UDF.java => exception/UDFException.java} | 60 +++--- .../UDFInputSeriesDataTypeNotValidException.java | 40 ++++ .../UDFInputSeriesIndexNotValidException.java} | 58 +++--- .../UDFInputSeriesNumberNotValidException.java} | 65 ++++--- .../UDFParameterNotValidException.java} | 56 +++--- .../db/query/udf/core/executor/UDTFExecutor.java | 14 +- .../apache/iotdb/db/rescon/MemTableManager.java | 116 ++++++++++++ .../org/apache/iotdb/db/rescon/SystemInfo.java | 1 + .../integration/IoTDBUDTFAlignByTimeQueryIT.java | 44 +++++ .../iotdb/db/query/udf/example/Accumulator.java | 8 + .../apache/iotdb/db/query/udf/example/Adder.java | 11 ++ .../org/apache/iotdb/db/query/udf/example/Max.java | 8 + .../iotdb/db/query/udf/example/Multiplier.java | 8 + .../SlidingSizeWindowConstructorTester1.java | 8 + .../SlidingTimeWindowConstructionTester.java | 8 + .../{Multiplier.java => ValidateTester.java} | 100 +++++----- server/src/test/resources/iotdb-engine.properties | 2 + 34 files changed, 874 insertions(+), 265 deletions(-) diff --cc cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java index f616728,39994bb..c69e421 --- a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java @@@ -179,9 -148,23 +179,23 @@@ public class ClusterMain } seedNodes.add(node); } - // assert this node is in NodeList + + // assert this node is in all nodes when restart + if (!metaServer.getMember().getAllNodes().isEmpty()) { + if (!metaServer.getMember().getAllNodes().contains(metaServer.getMember().getThisNode())) { + String message = String.format( + "All nodes in partitionTables must contains local node in start-server mode. " + + "LocalNode: %s, AllNodes: %s", + metaServer.getMember().getThisNode(), metaServer.getMember().getAllNodes()); + throw new StartupException(metaServer.getMember().getName(), message); + } else { + return; + } + } + + // assert this node is in seed nodes list Node localNode = new Node(); - localNode.setIp(config.getClusterRpcIp()).setMetaPort(config.getInternalMetaPort()) + localNode.setIp(IoTDBDescriptor.getInstance().getConfig().getRpcAddress()).setMetaPort(config.getInternalMetaPort()) .setDataPort(config.getInternalDataPort()).setClientPort(config.getClusterRpcPort()); if (!seedNodes.contains(localNode)) { String message = String.format(
