Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
c04e7853
I
Iotdb
项目概览
apache
/
Iotdb
10 个月 前同步成功
通知
25
Star
3344
Fork
916
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iotdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
c04e7853
编写于
7月 04, 2023
作者:
H
Haonan
提交者:
GitHub
7月 04, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix python IT and exclude duplicated netty dependencies (#10429)
上级
6a305dba
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
142 addition
and
193 deletion
+142
-193
docker/src/main/DockerCompose/start-1c1d.sh
docker/src/main/DockerCompose/start-1c1d.sh
+9
-3
docker/src/main/Dockerfile-1c1d
docker/src/main/Dockerfile-1c1d
+1
-1
docker/src/main/Dockerfile-1c1d-influxdb
docker/src/main/Dockerfile-1c1d-influxdb
+0
-51
docker/src/main/Dockerfile-single
docker/src/main/Dockerfile-single
+0
-45
docker/src/main/Dockerfile-single-influxdb
docker/src/main/Dockerfile-single-influxdb
+0
-46
docker/src/main/Dockerfile-single-tc
docker/src/main/Dockerfile-single-tc
+0
-45
iotdb-core/datanode/pom.xml
iotdb-core/datanode/pom.xml
+43
-2
iotdb-core/metrics/interface/pom.xml
iotdb-core/metrics/interface/pom.xml
+39
-0
iotdb-core/metrics/micrometer-metrics/pom.xml
iotdb-core/metrics/micrometer-metrics/pom.xml
+50
-0
未找到文件。
docker/src/main/DockerCompose/start-1c1d.sh
浏览文件 @
c04e7853
...
@@ -17,6 +17,12 @@
...
@@ -17,6 +17,12 @@
# specific language governing permissions and limitations
# specific language governing permissions and limitations
# under the License.
# under the License.
#
#
nohup
/iotdb/sbin/start-confignode.sh
>
/dev/null 2>&1 &
function
on_stop
(){
sleep
10
bash /iotdb/sbin/stop-confignode.sh
/iotdb/sbin/start-datanode.sh
}
trap
'on_stop'
SIGTERM SIGKILL SIGQUIT SIGINT
bash /iotdb/sbin/start-confignode.sh &
sleep
5
bash /iotdb/sbin/start-datanode.sh
docker/src/main/Dockerfile-1c1d
浏览文件 @
c04e7853
...
@@ -30,7 +30,6 @@ RUN apt update \
...
@@ -30,7 +30,6 @@ RUN apt update \
&& rm /apache-iotdb-*-bin.zip \
&& rm /apache-iotdb-*-bin.zip \
&& mv /apache-iotdb-* /iotdb \
&& mv /apache-iotdb-* /iotdb \
&& mv /start-1c1d.sh /iotdb/sbin \
&& 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/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/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/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 \
...
@@ -43,6 +42,7 @@ RUN apt update \
...
@@ -43,6 +42,7 @@ RUN apt update \
RUN dos2unix /iotdb/sbin/start-1c1d.sh
RUN dos2unix /iotdb/sbin/start-1c1d.sh
RUN dos2unix /iotdb/sbin/iotdb-common.sh
RUN dos2unix /iotdb/sbin/iotdb-common.sh
RUN dos2unix /iotdb/sbin/start-confignode.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/../conf/confignode-env.sh
RUN dos2unix /iotdb/sbin/start-datanode.sh
RUN dos2unix /iotdb/sbin/start-datanode.sh
RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh
RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh
...
...
docker/src/main/Dockerfile-1c1d-influxdb
已删除
100644 → 0
浏览文件 @
6a305dba
#
# 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-*-all-bin.zip /
ADD docker/src/main/DockerCompose/start-1c1d.sh /
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 \
&& 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 \
&& apt remove unzip -y \
&& apt autoremove -y \
&& apt purge --auto-remove -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/../conf/confignode-env.sh
RUN dos2unix /iotdb/sbin/start-datanode.sh
RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh
EXPOSE 6667
VOLUME /iotdb/data
VOLUME /iotdb/logs
ENV PATH="/iotdb/sbin/:/iotdb/tools/:${PATH}"
ENTRYPOINT ["/iotdb/sbin/start-1c1d.sh"]
docker/src/main/Dockerfile-single
已删除
100644 → 0
浏览文件 @
6a305dba
#
# 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 \
&& 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"]
docker/src/main/Dockerfile-single-influxdb
已删除
100644 → 0
浏览文件 @
6a305dba
#
# 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"]
docker/src/main/Dockerfile-single-tc
已删除
100644 → 0
浏览文件 @
6a305dba
#
# 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 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
iotdb-core/datanode/pom.xml
浏览文件 @
c04e7853
...
@@ -120,7 +120,7 @@
...
@@ -120,7 +120,7 @@
<dependency>
<dependency>
<groupId>
de.fraunhofer.iosb.io.moquette
</groupId>
<groupId>
de.fraunhofer.iosb.io.moquette
</groupId>
<artifactId>
moquette-broker
</artifactId>
<artifactId>
moquette-broker
</artifactId>
<version>
0.1
4.3
</version>
<version>
0.1
5.2
</version>
<exclusions>
<exclusions>
<exclusion>
<exclusion>
<groupId>
log4j
</groupId>
<groupId>
log4j
</groupId>
...
@@ -128,7 +128,11 @@
...
@@ -128,7 +128,11 @@
</exclusion>
</exclusion>
<exclusion>
<exclusion>
<groupId>
org.slf4j
</groupId>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-log4j12
</artifactId>
<artifactId>
log4j
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-reload4j
</artifactId>
</exclusion>
</exclusion>
<exclusion>
<exclusion>
<groupId>
com.zaxxer
</groupId>
<groupId>
com.zaxxer
</groupId>
...
@@ -138,8 +142,45 @@
...
@@ -138,8 +142,45 @@
<groupId>
io.dropwizard.metrics
</groupId>
<groupId>
io.dropwizard.metrics
</groupId>
<artifactId>
metrics-jvm
</artifactId>
<artifactId>
metrics-jvm
</artifactId>
</exclusion>
</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>
</exclusions>
</dependency>
</dependency>
<dependency>
<groupId>
io.netty
</groupId>
<artifactId>
netty-codec-mqtt
</artifactId>
<version>
${netty.version}
</version>
</dependency>
<!-- for mocked test-->
<!-- for mocked test-->
<dependency>
<dependency>
<groupId>
org.powermock
</groupId>
<groupId>
org.powermock
</groupId>
...
...
iotdb-core/metrics/interface/pom.xml
浏览文件 @
c04e7853
...
@@ -45,6 +45,45 @@
...
@@ -45,6 +45,45 @@
<groupId>
io.projectreactor.netty
</groupId>
<groupId>
io.projectreactor.netty
</groupId>
<artifactId>
reactor-netty-http
</artifactId>
<artifactId>
reactor-netty-http
</artifactId>
<version>
${reactor-netty-http.version}
</version>
<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>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
iotdb-core/metrics/micrometer-metrics/pom.xml
浏览文件 @
c04e7853
...
@@ -42,6 +42,17 @@
...
@@ -42,6 +42,17 @@
<groupId>
io.micrometer
</groupId>
<groupId>
io.micrometer
</groupId>
<artifactId>
micrometer-registry-jmx
</artifactId>
<artifactId>
micrometer-registry-jmx
</artifactId>
<version>
${micrometer.metrics.version}
</version>
<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>
<dependency>
<dependency>
<groupId>
io.dropwizard.metrics
</groupId>
<groupId>
io.dropwizard.metrics
</groupId>
...
@@ -52,6 +63,45 @@
...
@@ -52,6 +63,45 @@
<groupId>
io.projectreactor.netty
</groupId>
<groupId>
io.projectreactor.netty
</groupId>
<artifactId>
reactor-netty-http
</artifactId>
<artifactId>
reactor-netty-http
</artifactId>
<version>
1.0.24
</version>
<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>
</dependency>
</dependencies>
</dependencies>
</project>
</project>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录