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/07/25 04:24:38 UTC
[iotdb] 03/03: Revert "fix python IT and exclude duplicated netty dependencies (#10429)"
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch test_0724
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 10a039f63de09e5d788568ea69bd25686727c4b4
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Jul 24 11:34:29 2023 +0800
Revert "fix python IT and exclude duplicated netty dependencies (#10429)"
This reverts commit c04e7853907d045912e3e9f87371db6a8f356494.
---
docker/src/main/DockerCompose/start-1c1d.sh | 12 ++----
docker/src/main/Dockerfile-1c1d | 2 +-
.../{Dockerfile-1c1d => Dockerfile-1c1d-influxdb} | 8 ++--
.../start-1c1d.sh => Dockerfile-single} | 33 ++++++++++----
docker/src/main/Dockerfile-single-influxdb | 46 ++++++++++++++++++++
.../start-1c1d.sh => Dockerfile-single-tc} | 33 ++++++++++----
iotdb-core/datanode/pom.xml | 45 +------------------
iotdb-core/metrics/interface/pom.xml | 39 -----------------
iotdb-core/metrics/micrometer-metrics/pom.xml | 50 ----------------------
9 files changed, 105 insertions(+), 163 deletions(-)
diff --git a/docker/src/main/DockerCompose/start-1c1d.sh b/docker/src/main/DockerCompose/start-1c1d.sh
index 1c89dc91c5d..6eaad325398 100755
--- a/docker/src/main/DockerCompose/start-1c1d.sh
+++ b/docker/src/main/DockerCompose/start-1c1d.sh
@@ -17,12 +17,6 @@
# specific language governing permissions and limitations
# under the License.
#
-function on_stop(){
- bash /iotdb/sbin/stop-confignode.sh
-}
-
-trap 'on_stop' SIGTERM SIGKILL SIGQUIT SIGINT
-
-bash /iotdb/sbin/start-confignode.sh &
-sleep 5
-bash /iotdb/sbin/start-datanode.sh
+nohup /iotdb/sbin/start-confignode.sh > /dev/null 2>&1 &
+sleep 10
+/iotdb/sbin/start-datanode.sh
diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-1c1d
index b5e28aac4df..50201ca0b1a 100644
--- a/docker/src/main/Dockerfile-1c1d
+++ b/docker/src/main/Dockerfile-1c1d
@@ -30,6 +30,7 @@ RUN apt update \
&& rm /apache-iotdb-*-bin.zip \
&& mv /apache-iotdb-* /iotdb \
&& mv /start-1c1d.sh /iotdb/sbin \
+ && sed -i 's/dn_rpc_address=127.0.0.1/dn_rpc_address=0.0.0.0/g' /iotdb/conf/iotdb-datanode.properties \
&& 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 \
@@ -42,7 +43,6 @@ RUN apt update \
RUN dos2unix /iotdb/sbin/start-1c1d.sh
RUN dos2unix /iotdb/sbin/iotdb-common.sh
RUN dos2unix /iotdb/sbin/start-confignode.sh
-RUN dos2unix /iotdb/sbin/stop-confignode.sh
RUN dos2unix /iotdb/sbin/../conf/confignode-env.sh
RUN dos2unix /iotdb/sbin/start-datanode.sh
RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh
diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-1c1d-influxdb
similarity index 71%
copy from docker/src/main/Dockerfile-1c1d
copy to docker/src/main/Dockerfile-1c1d-influxdb
index b5e28aac4df..9877cfa3349 100644
--- a/docker/src/main/Dockerfile-1c1d
+++ b/docker/src/main/Dockerfile-1c1d-influxdb
@@ -30,19 +30,17 @@ RUN apt update \
&& rm /apache-iotdb-*-bin.zip \
&& mv /apache-iotdb-* /iotdb \
&& mv /start-1c1d.sh /iotdb/sbin \
+ && sed -i 's/# enable_influxdb_rpc_service=false/enable_influxdb_rpc_service=true/g' /iotdb/conf/iotdb-common.properties \
+ && sed -i 's/dn_rpc_address=127.0.0.1/dn_rpc_address=0.0.0.0/g' /iotdb/conf/iotdb-datanode.properties \
&& 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 \
&& apt remove unzip -y \
&& apt autoremove -y \
&& apt purge --auto-remove -y \
- && apt clean -y \
+ && apt clean -y
RUN dos2unix /iotdb/sbin/start-1c1d.sh
RUN dos2unix /iotdb/sbin/iotdb-common.sh
RUN dos2unix /iotdb/sbin/start-confignode.sh
-RUN dos2unix /iotdb/sbin/stop-confignode.sh
RUN dos2unix /iotdb/sbin/../conf/confignode-env.sh
RUN dos2unix /iotdb/sbin/start-datanode.sh
RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh
diff --git a/docker/src/main/DockerCompose/start-1c1d.sh b/docker/src/main/Dockerfile-single
old mode 100755
new mode 100644
similarity index 53%
copy from docker/src/main/DockerCompose/start-1c1d.sh
copy to docker/src/main/Dockerfile-single
index 1c89dc91c5d..3c1629cd864
--- a/docker/src/main/DockerCompose/start-1c1d.sh
+++ b/docker/src/main/Dockerfile-single
@@ -1,4 +1,3 @@
-#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,12 +16,30 @@
# specific language governing permissions and limitations
# under the License.
#
-function on_stop(){
- bash /iotdb/sbin/stop-confignode.sh
-}
-trap 'on_stop' SIGTERM SIGKILL SIGQUIT SIGINT
+# docker build context is the root path of the repository
-bash /iotdb/sbin/start-confignode.sh &
-sleep 5
-bash /iotdb/sbin/start-datanode.sh
+FROM openjdk:11-jre-slim
+
+ADD distribution/target/apache-iotdb-*-datanode-bin.zip /
+
+RUN apt update \
+ && apt install lsof dos2unix procps unzip -y \
+ && unzip /apache-iotdb-*-bin.zip -d / \
+ && rm /apache-iotdb-*-bin.zip \
+ && mv /apache-iotdb-* /iotdb \
+ && apt remove unzip -y \
+ && apt autoremove -y \
+ && apt purge --auto-remove -y \
+ && apt clean -y
+RUN dos2unix /iotdb/sbin/start-server.sh
+RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh
+EXPOSE 6667
+EXPOSE 31999
+EXPOSE 5555
+EXPOSE 8086
+EXPOSE 8181
+VOLUME /iotdb/data
+VOLUME /iotdb/logs
+ENV PATH="/iotdb/sbin/:/iotdb/tools/:${PATH}"
+ENTRYPOINT ["/iotdb/sbin/start-server.sh"]
diff --git a/docker/src/main/Dockerfile-single-influxdb b/docker/src/main/Dockerfile-single-influxdb
new file mode 100644
index 00000000000..ff15b26cfbe
--- /dev/null
+++ b/docker/src/main/Dockerfile-single-influxdb
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+
+# docker build context is the root path of the repository
+
+FROM openjdk:11-jre-slim
+
+ADD distribution/target/apache-iotdb-*-datanode-bin.zip /
+
+RUN apt update \
+ && apt install lsof dos2unix procps unzip -y \
+ && unzip /apache-iotdb-*-bin.zip -d / \
+ && rm /apache-iotdb-*-bin.zip \
+ && mv /apache-iotdb-* /iotdb \
+ && sed -i '/^# enable_influxdb_rpc_service=false/a enable_influxdb_rpc_service=true' /iotdb/sbin/../conf/iotdb-datanode.properties \
+ && apt remove unzip -y \
+ && apt autoremove -y \
+ && apt purge --auto-remove -y \
+ && apt clean -y
+RUN dos2unix /iotdb/sbin/start-new-server.sh
+RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh
+EXPOSE 6667
+EXPOSE 31999
+EXPOSE 5555
+EXPOSE 8086
+EXPOSE 8181
+VOLUME /iotdb/data
+VOLUME /iotdb/logs
+ENV PATH="/iotdb/sbin/:/iotdb/tools/:${PATH}"
+ENTRYPOINT ["/iotdb/sbin/start-new-server.sh"]
diff --git a/docker/src/main/DockerCompose/start-1c1d.sh b/docker/src/main/Dockerfile-single-tc
old mode 100755
new mode 100644
similarity index 52%
copy from docker/src/main/DockerCompose/start-1c1d.sh
copy to docker/src/main/Dockerfile-single-tc
index 1c89dc91c5d..d4dd297c744
--- a/docker/src/main/DockerCompose/start-1c1d.sh
+++ b/docker/src/main/Dockerfile-single-tc
@@ -1,4 +1,3 @@
-#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,12 +16,30 @@
# specific language governing permissions and limitations
# under the License.
#
-function on_stop(){
- bash /iotdb/sbin/stop-confignode.sh
-}
-trap 'on_stop' SIGTERM SIGKILL SIGQUIT SIGINT
+# docker build context is the root path of the repository
-bash /iotdb/sbin/start-confignode.sh &
-sleep 5
-bash /iotdb/sbin/start-datanode.sh
+FROM openjdk:11-jre-slim
+
+ADD distribution/target/apache-iotdb-*-datanode-bin.zip /
+
+RUN apt update \
+ && apt install lsof dos2unix procps unzip iproute2 iputils-ping -y \
+ && unzip /apache-iotdb-*-bin.zip -d / \
+ && rm /apache-iotdb-*-bin.zip \
+ && mv /apache-iotdb-* /iotdb \
+ && apt remove unzip -y \
+ && apt autoremove -y \
+ && apt purge --auto-remove -y \
+ && apt clean -y
+RUN dos2unix /iotdb/sbin/start-server.sh
+RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh
+EXPOSE 6667
+EXPOSE 31999
+EXPOSE 5555
+EXPOSE 8086
+EXPOSE 8181
+VOLUME /iotdb/data
+VOLUME /iotdb/logs
+ENV PATH="/iotdb/sbin/:/iotdb/tools/:${PATH}"
+ENTRYPOINT ["/iotdb/sbin/start-server.sh"]
\ No newline at end of file
diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml
index aed6260a893..88f80a40fb4 100644
--- a/iotdb-core/datanode/pom.xml
+++ b/iotdb-core/datanode/pom.xml
@@ -120,7 +120,7 @@
<dependency>
<groupId>de.fraunhofer.iosb.io.moquette</groupId>
<artifactId>moquette-broker</artifactId>
- <version>0.15.2</version>
+ <version>0.14.3</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -128,11 +128,7 @@
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>com.zaxxer</groupId>
@@ -142,45 +138,8 @@
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
</exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-mqtt</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-mqtt</artifactId>
- <version>${netty.version}</version>
- </dependency>
<!-- for mocked test-->
<dependency>
<groupId>org.powermock</groupId>
diff --git a/iotdb-core/metrics/interface/pom.xml b/iotdb-core/metrics/interface/pom.xml
index 4061f7bc07d..55ae005f1d2 100644
--- a/iotdb-core/metrics/interface/pom.xml
+++ b/iotdb-core/metrics/interface/pom.xml
@@ -45,45 +45,6 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<version>${reactor-netty-http.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns-native-macos</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>${netty.version}</version>
</dependency>
</dependencies>
<build>
diff --git a/iotdb-core/metrics/micrometer-metrics/pom.xml b/iotdb-core/metrics/micrometer-metrics/pom.xml
index 86e989371b1..66b022220d3 100644
--- a/iotdb-core/metrics/micrometer-metrics/pom.xml
+++ b/iotdb-core/metrics/micrometer-metrics/pom.xml
@@ -42,17 +42,6 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-jmx</artifactId>
<version>${micrometer.metrics.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
@@ -63,45 +52,6 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<version>1.0.24</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns-native-macos</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>${netty.version}</version>
</dependency>
</dependencies>
</project>