This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch remove_more in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e6347e495c8b6467bedb50ac12ff7930d61e340e Author: HTHou <[email protected]> AuthorDate: Mon Jun 27 16:07:15 2022 +0800 Remove more code about old cluster module --- .github/workflows/main-unix.yml | 3 +- .github/workflows/main-win.yml | 14 ++----- integration/pom.xml | 5 --- .../src/test/resources/iotdb-datanode.properties | 2 +- testcontainer/Readme.md | 8 +--- testcontainer/pom.xml | 12 ------ .../src/test/resources/1node/docker-compose.yaml | 44 ---------------------- .../test/resources/1node/iotdb-cluster.properties | 35 ----------------- .../src/test/resources/3nodes/docker-compose.yaml | 44 ---------------------- .../test/resources/3nodes/iotdb-cluster.properties | 35 ----------------- .../src/test/resources/5nodes/docker-compose.yaml | 43 --------------------- .../test/resources/5nodes/iotdb-cluster.properties | 35 ----------------- ...engine.properties => iotdb-datanode.properties} | 2 +- 13 files changed, 8 insertions(+), 274 deletions(-) diff --git a/.github/workflows/main-unix.yml b/.github/workflows/main-unix.yml index a6448d2406..b18190297e 100644 --- a/.github/workflows/main-unix.yml +++ b/.github/workflows/main-unix.yml @@ -55,5 +55,4 @@ jobs: - name: IT/UT Test shell: bash # we do not compile client-cpp for saving time, it is tested in client.yml - # old cluster is deprecated, skip the test - run: mvn -B clean verify -Dtest.port.closed=true -Dcluster.test.skip=true -P '!testcontainer' + run: mvn -B clean verify -Dtest.port.closed=true -P '!testcontainer' diff --git a/.github/workflows/main-win.yml b/.github/workflows/main-win.yml index 43423047fc..b591c0b266 100644 --- a/.github/workflows/main-win.yml +++ b/.github/workflows/main-win.yml @@ -35,13 +35,11 @@ jobs: max-parallel: 20 matrix: java: [ 8, 11, 17 ] - # to reduce the CI time cost; we split the whole CI to 3 parts: - # modules except the server and the cluster: - # -Diotdb.skip.test=true -Dcluster.skip.test=true + # to reduce the CI time cost; we split the whole CI to 2 parts: + # modules except the server: + # -Diotdb.skip.test=true # the server module: # -pl server -am -DskipTests=true -Diotdb.test.only=true - # the cluster module: - # -pl cluster -am -DskipTests=true -Dcluster.test.only=true # but we just add labels here to make the action name more graceful it_task: [ 'others', 'server' @@ -105,12 +103,8 @@ jobs: shell: bash if: ${{ matrix.it_task == 'server'}} run: source ~/.bash_profile && mvn -B clean integration-test -Dtest.port.closed=true -pl server -am -DskipTests=true -Diotdb.test.only=true - - name: Test Cluster Module with Maven - shell: bash - if: ${{ matrix.it_task == 'cluster'}} - run: source ~/.bash_profile && mvn -B clean integration-test -Dtest.port.closed=true -pl cluster -am -DskipTests=true -Dcluster.test.only=true - name: Test Other Modules with Maven shell: bash if: ${{ matrix.it_task == 'others'}} - run: source ~/.bash_profile && mvn -B clean verify -Dtest.port.closed=true -Diotdb.test.skip=true -Dcluster.test.skip=true + run: source ~/.bash_profile && mvn -B clean verify -Dtest.port.closed=true -Diotdb.test.skip=true diff --git a/integration/pom.xml b/integration/pom.xml index 2e572d63fc..b502a63885 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -41,11 +41,6 @@ <type>test-jar</type> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.iotdb</groupId> - <artifactId>iotdb-cluster</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-session</artifactId> diff --git a/server/src/test/resources/iotdb-datanode.properties b/server/src/test/resources/iotdb-datanode.properties index 86cb9ba942..cc2f8613fa 100644 --- a/server/src/test/resources/iotdb-datanode.properties +++ b/server/src/test/resources/iotdb-datanode.properties @@ -19,7 +19,7 @@ base_dir=target/tmp data_dirs=target/data -wal_dir=target/wal +wal_dirs=target/wal index_root_dir=target/index udf_root_dir=target/ext/udf trigger_root_dir=target/ext/trigger diff --git a/testcontainer/Readme.md b/testcontainer/Readme.md index 46cf905fc6..d4899781d4 100644 --- a/testcontainer/Readme.md +++ b/testcontainer/Readme.md @@ -42,7 +42,7 @@ Before running `integration-test` in this module, binaries must be generated in e.g, call `mvn package -Dmaven.test.skip=true`. In this module, when running `mvn pre-integration-test` (or `mvn integration-test`, `mvn post-integration-test`), -the module will build two docker images, `apache/iotdb:maven-development`, and `apache/iotdb:cluster-maven-development`. +the module will build docker image, `apache/iotdb:maven-development`. In the `post-integration-test` phase, the above images will be removed. @@ -51,12 +51,6 @@ In the `integration-test` phase, all `src/test/java/**/*IT.java` will be tested. ## How it runs `apache/iotdb:maven-development` is generated following the Dockerfile `${basedir}/docker/src/main/Dockerfile-single`, and -`apache/iotdb:cluster-maven-development` is generated following the Dockerfile `${basedir}/docker/src/main/Dockerfile-cluster`. - -For testing a cluster, we use `docker-compose` and `testcontainer`. - -The docker-compose file is located at `src/test/resources/1nodes`, `src/test/resources/3nodes` and `src/test/resources/5nodes`, -in which one is for 1 node with replica number =1 , 3 nodes with replica number=3, and the last one is for 5 nodes with replica number =3. For testing sync module only, we use `mvn integration-test -P sync`. diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml index b66a1a47ba..fbaf385684 100644 --- a/testcontainer/pom.xml +++ b/testcontainer/pom.xml @@ -88,18 +88,6 @@ <commandlineArgs>${docker.build.single.argument}</commandlineArgs> </configuration> </execution> - <!-- <execution>--> - <!-- <id>build-cluster-docker-image</id>--> - <!-- <phase>pre-integration-test</phase>--> - <!-- <goals>--> - <!-- <goal>exec</goal>--> - <!-- </goals>--> - <!-- <configuration>--> - <!-- <skip>${docker.test.skip}</skip>--> - <!-- <executable>${docker.build.executable}</executable>--> - <!-- <commandlineArgs>${docker.build.cluster.argument}</commandlineArgs>--> - <!-- </configuration>--> - <!-- </execution>--> <execution> <id>build-sync-docker-image</id> <phase>pre-integration-test</phase> diff --git a/testcontainer/src/test/resources/1node/docker-compose.yaml b/testcontainer/src/test/resources/1node/docker-compose.yaml deleted file mode 100644 index e1308beb22..0000000000 --- a/testcontainer/src/test/resources/1node/docker-compose.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -version: '3.8' - -services: - iotdb-server: - image: apache/iotdb:cluster-maven-development - expose: - - 6667 - - 9003 - - 40010 - networks: - - iotdb - healthcheck: - test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/6667" ] - interval: 5s - timeout: 60s - retries: 120 - volumes: - - ./iotdb-cluster.properties:/iotdb/conf/iotdb-cluster.properties - - ../logback-container.xml:/iotdb/conf/logback.xml - scale: 1 - - -networks: - iotdb: - driver: bridge diff --git a/testcontainer/src/test/resources/1node/iotdb-cluster.properties b/testcontainer/src/test/resources/1node/iotdb-cluster.properties deleted file mode 100644 index e60395a206..0000000000 --- a/testcontainer/src/test/resources/1node/iotdb-cluster.properties +++ /dev/null @@ -1,35 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -internal_meta_port=9003 -internal_data_port=40010 -seed_nodes=1node_iotdb-server_1:9003 -default_replica_num=1 -consistency_level=mid -connection_timeout_ms=20000 -write_operation_timeout_ms=30000 -read_operation_timeout_ms=30000 -catch_up_timeout_ms=300000 -use_batch_in_catch_up=true -min_num_of_logs_in_mem=1000 -max_num_of_logs_in_mem=2000 -log_deletion_check_interval_second=-1 -is_use_async_server=false -is_use_async_applier=true -is_enable_raft_log_persistence=true -open_server_rpc_port=false diff --git a/testcontainer/src/test/resources/3nodes/docker-compose.yaml b/testcontainer/src/test/resources/3nodes/docker-compose.yaml deleted file mode 100644 index 9349e1c216..0000000000 --- a/testcontainer/src/test/resources/3nodes/docker-compose.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -version: '3.8' - -services: - iotdb-server: - image: apache/iotdb:cluster-maven-development - expose: - - 6667 - - 9003 - - 40010 - networks: - - iotdb - healthcheck: - test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/6667" ] - interval: 5s - timeout: 60s - retries: 120 - volumes: - - ./iotdb-cluster.properties:/iotdb/conf/iotdb-cluster.properties - - ../logback-container.xml:/iotdb/conf/logback.xml - scale: 3 - - -networks: - iotdb: - driver: bridge diff --git a/testcontainer/src/test/resources/3nodes/iotdb-cluster.properties b/testcontainer/src/test/resources/3nodes/iotdb-cluster.properties deleted file mode 100644 index fe6133d5e0..0000000000 --- a/testcontainer/src/test/resources/3nodes/iotdb-cluster.properties +++ /dev/null @@ -1,35 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -internal_meta_port=9003 -internal_data_port=40010 -seed_nodes=3nodes_iotdb-server_1:9003,3nodes_iotdb-server_2:9003,3nodes_iotdb-server_3:9003 -default_replica_num=3 -consistency_level=mid -connection_timeout_ms=20000 -write_operation_timeout_ms=30000 -read_operation_timeout_ms=30000 -catch_up_timeout_ms=300000 -use_batch_in_catch_up=true -min_num_of_logs_in_mem=1000 -max_num_of_logs_in_mem=2000 -log_deletion_check_interval_second=-1 -is_use_async_server=false -is_use_async_applier=true -is_enable_raft_log_persistence=true -open_server_rpc_port=false diff --git a/testcontainer/src/test/resources/5nodes/docker-compose.yaml b/testcontainer/src/test/resources/5nodes/docker-compose.yaml deleted file mode 100644 index 5ca9bd1b82..0000000000 --- a/testcontainer/src/test/resources/5nodes/docker-compose.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -version: '3.8' - -services: - iotdb-server: - image: apache/iotdb:cluster-maven-development - expose: - - 6667 - - 9003 - - 40010 - networks: - - iotdb - healthcheck: - test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/6667" ] - interval: 5s - timeout: 60s - retries: 120 - volumes: - - ./iotdb-cluster.properties:/iotdb/conf/iotdb-cluster.properties - - ../logback-container.xml:/iotdb/conf/logback.xml - scale: 5 - -networks: - iotdb: - driver: bridge diff --git a/testcontainer/src/test/resources/5nodes/iotdb-cluster.properties b/testcontainer/src/test/resources/5nodes/iotdb-cluster.properties deleted file mode 100644 index 705cca6d13..0000000000 --- a/testcontainer/src/test/resources/5nodes/iotdb-cluster.properties +++ /dev/null @@ -1,35 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -internal_meta_port=9003 -internal_data_port=40010 -seed_nodes=5nodes_iotdb-server_1:9003,5nodes_iotdb-server_2:9003,5nodes_iotdb-server_3:9003,5nodes_iotdb-server_4:9003,5nodes_iotdb-server_5:9003 -default_replica_num=3 -consistency_level=mid -connection_timeout_ms=20000 -write_operation_timeout_ms=30000 -read_operation_timeout_ms=30000 -catch_up_timeout_ms=300000 -use_batch_in_catch_up=true -min_num_of_logs_in_mem=1000 -max_num_of_logs_in_mem=2000 -log_deletion_check_interval_second=-1 -is_use_async_server=false -is_use_async_applier=true -is_enable_raft_log_persistence=true -open_server_rpc_port=false diff --git a/testcontainer/src/test/resources/iotdb-engine.properties b/testcontainer/src/test/resources/iotdb-datanode.properties similarity index 94% rename from testcontainer/src/test/resources/iotdb-engine.properties rename to testcontainer/src/test/resources/iotdb-datanode.properties index 960aa13b97..bb967c419c 100644 --- a/testcontainer/src/test/resources/iotdb-engine.properties +++ b/testcontainer/src/test/resources/iotdb-datanode.properties @@ -18,7 +18,7 @@ base_dir=target/tmp data_dirs=target/data -wal_dir=target/wal +wal_dirs=target/wal index_root_dir=target/index udf_root_dir=target/ext tracing_dir=target/data/tracing \ No newline at end of file
