You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/08/04 06:19:19 UTC
[iotdb] branch rel/1.2 updated: [To rel/1.2] Fix rel/1.2 branch CI issues (#10776)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 7fbe00e0c67 [To rel/1.2] Fix rel/1.2 branch CI issues (#10776)
7fbe00e0c67 is described below
commit 7fbe00e0c67825cc0ce77c95054b29600a1d227a
Author: Haonan <hh...@outlook.com>
AuthorDate: Fri Aug 4 14:19:11 2023 +0800
[To rel/1.2] Fix rel/1.2 branch CI issues (#10776)
---
.github/workflows/client-cpp.yml | 5 -----
.github/workflows/client-python.yml | 1 -
.github/workflows/sonar-coveralls.yml | 2 +-
docker/src/main/Dockerfile-1c1d | 8 +++++---
iotdb-client/client-py/iotdb/IoTDBContainer.py | 11 +++++++++++
.../apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java | 6 ------
.../src/main/java/org/apache/iotdb/db/service/DataNode.java | 8 --------
pom.xml | 1 +
8 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/client-cpp.yml b/.github/workflows/client-cpp.yml
index 5e5b0242e86..67cfe90ac1d 100644
--- a/.github/workflows/client-cpp.yml
+++ b/.github/workflows/client-cpp.yml
@@ -79,11 +79,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v3
- with:
- distribution: liberica
- java-version: 11
- name: Cache Maven packages
uses: actions/cache@v3
with:
diff --git a/.github/workflows/client-python.yml b/.github/workflows/client-python.yml
index df715682274..5fd63dfbe3f 100644
--- a/.github/workflows/client-python.yml
+++ b/.github/workflows/client-python.yml
@@ -7,7 +7,6 @@ on:
branches:
- master
- 'rel/*'
- - "new_*"
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git a/.github/workflows/sonar-coveralls.yml b/.github/workflows/sonar-coveralls.yml
index 22a56157900..23ec394a897 100644
--- a/.github/workflows/sonar-coveralls.yml
+++ b/.github/workflows/sonar-coveralls.yml
@@ -74,7 +74,7 @@ jobs:
run: |
mvn -B verify sonar:sonar \
-Dsonar.organization=apache \
- -Dsonar.projectKey=apache_incubator-iotdb \
+ -Dsonar.projectKey=apache_iotdb \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.login=${{ secrets.SONARCLOUD_TOKEN }} \
-DskipTests -pl '!distribution,!integration-test' -am
diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-1c1d
index e8c90aff873..aefa5d2965a 100644
--- a/docker/src/main/Dockerfile-1c1d
+++ b/docker/src/main/Dockerfile-1c1d
@@ -32,9 +32,11 @@ RUN apt update \
&& mv /start-1c1d.sh /iotdb/sbin \
&& sed -i 's/dn_internal_address=127.0.0.1/dn_internal_address=0.0.0.0/g' /iotdb/conf/iotdb-datanode.properties \
&& sed -i 's/cn_internal_address=127.0.0.1/cn_internal_address=0.0.0.0/g' /iotdb/conf/iotdb-confignode.properties \
- && sed -i 's/config_node_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/config_node_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-common.properties \
- && sed -i 's/schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/schema_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-common.properties \
- && sed -i 's/data_region_consensus_protocol_class=org.apache.iotdb.consensus.iot.IoTConsensus/data_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-common.properties \
+ && sed -i 's/cn_target_config_node_list=127.0.0.1:10710/cn_target_config_node_list=0.0.0.0:10710/g' /iotdb/conf/iotdb-confignode.properties \
+ && sed -i 's/dn_target_config_node_list=127.0.0.1:10710/dn_target_config_node_list=0.0.0.0:10710/g' /iotdb/conf/iotdb-datanode.properties \
+ && sed -i 's/# config_node_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/config_node_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-common.properties \
+ && sed -i 's/# schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/schema_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-common.properties \
+ && sed -i 's/# data_region_consensus_protocol_class=org.apache.iotdb.consensus.iot.IoTConsensus/data_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-common.properties \
&& apt remove unzip -y \
&& apt autoremove -y \
&& apt purge --auto-remove -y \
diff --git a/iotdb-client/client-py/iotdb/IoTDBContainer.py b/iotdb-client/client-py/iotdb/IoTDBContainer.py
index 9a0188798ff..829d201f25d 100644
--- a/iotdb-client/client-py/iotdb/IoTDBContainer.py
+++ b/iotdb-client/client-py/iotdb/IoTDBContainer.py
@@ -16,13 +16,17 @@
# under the License.
#
+import time
from os import environ
from testcontainers.core.container import DockerContainer
+from testcontainers.core.utils import setup_logger
from testcontainers.core.waiting_utils import wait_container_is_ready
from iotdb.Session import Session
+logger = setup_logger(__name__)
+
class IoTDBContainer(DockerContainer):
IOTDB_USER = environ.get("IOTDB_USER", "root")
@@ -48,4 +52,11 @@ class IoTDBContainer(DockerContainer):
self._configure()
super().start()
self._connect()
+ # sleep 2s to make sure the confignode cached the datanode info
+ time.sleep(2)
+ return self
+
+ def stop(self, force=True, delete_volume=True):
+ logger.info(self.get_wrapped_container().logs().decode("utf-8"))
+ super().stop(force, delete_volume)
return self
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
index dbd9bb24390..18882e9095a 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
@@ -163,12 +163,6 @@ public class ConfigNodeStartupCheck extends StartupChecks {
"an unrecognized route_priority_policy is set");
}
- // The ip of target ConfigNode couldn't be 0.0.0.0
- if (CONF.getTargetConfigNode().getIp().equals("0.0.0.0")) {
- throw new ConfigurationException(
- "The ip address of any target_config_node_list couldn't be 0.0.0.0");
- }
-
// The default RegionGroupNum should be positive
if (CONF.getDefaultSchemaRegionGroupNumPerDatabase() <= 0) {
throw new ConfigurationException("The default_schema_region_group_num should be positive");
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
index 7aa275ae1dc..1230d9be8d2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
@@ -207,14 +207,6 @@ public class DataNode implements DataNodeMBean {
// Notice: Consider this DataNode as first start if the system.properties file doesn't exist
boolean isFirstStart = IoTDBStartCheck.getInstance().checkIsFirstStart();
- // Check target ConfigNodes
- for (TEndPoint endPoint : config.getTargetConfigNodeList()) {
- if (endPoint.getIp().equals("0.0.0.0")) {
- throw new StartupException(
- "The ip address of any target_config_node_list couldn't be 0.0.0.0");
- }
- }
-
// Set this node
thisNode.setIp(config.getInternalAddress());
thisNode.setPort(config.getInternalPort());
diff --git a/pom.xml b/pom.xml
index 7f95bca1740..f7a49ea2e98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -730,6 +730,7 @@
<!-- only for Travis CI with WinOS-->
<exclude>hadoopbin</exclude>
<exclude>windowssystem32</exclude>
+ <exclude>.ignore</exclude>
<!-- generated by Github -->
<exclude>**/.github/**</exclude>
<!-- figures -->