This is an automated email from the ASF dual-hosted git repository.
jacktengg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 8f13a545572 [fix][docker] update routine load test docker image
(#34686)
8f13a545572 is described below
commit 8f13a545572d94979385b1bc5c56807b82beffa3
Author: XuJianxu <xjxlzl...@163.com>
AuthorDate: Sat May 11 18:29:55 2024 +0800
[fix][docker] update routine load test docker image (#34686)
* [fix][docker] fix kafka image error
* update kafka docker
* update docker yaml file
---------
Co-authored-by: 胥剑旭 <xujianxu@xujianxudeMacBook-Pro.local>
---
.../thirdparties/docker-compose/kafka/kafka.yaml.tpl | 19 +++++++++++--------
docker/thirdparties/run-thirdparties-docker.sh | 4 ++--
.../pipeline/p0/conf/regression-conf.groovy | 6 +++---
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl
b/docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl
index 41b721938ff..ca9a5d494da 100644
--- a/docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl
+++ b/docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl
@@ -22,19 +22,21 @@ networks:
ipam:
driver: default
config:
- - subnet: 168.45.0.0/24
-
+ - subnet: 192.168.0.0/24
services:
doris--zookeeper:
- image: wurstmeister/zookeeper
+ image: bitnami/zookeeper
restart: always
container_name: doris--zookeeper
ports:
- ${DOCKER_ZOOKEEPER_EXTERNAL_PORT}:2181
+ environment:
+ - ZOO_CFG_LISTEN_PORT=2181
+ - ALLOW_ANONYMOUS_LOGIN=yes
networks:
- doris--kafka--network
doris--kafka:
- image: wurstmeister/kafka
+ image: bitnami/kafka:2
restart: always
container_name: doris--kafka
depends_on:
@@ -42,10 +44,11 @@ services:
ports:
- ${DOCKER_KAFKA_EXTERNAL_PORT}:19193
environment:
- KAFKA_ZOOKEEPER_CONNECT: doris--zookeeper:2181/kafka
- KAFKA_LISTENERS: PLAINTEXT://:19193
- KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:19193
- KAFKA_BROKER_ID: 1
+ - KAFKA_BROKER_ID=1
+ - KAFKA_LISTENERS=PLAINTEXT://:19193
+ - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://localhost:19193
+ - KAFKA_ZOOKEEPER_CONNECT=doris--zookeeper:2181
+ - ALLOW_PLAINTEXT_LISTENER=yes
volumes:
- /var/run/docker.sock:/var/run/docker.sock
networks:
diff --git a/docker/thirdparties/run-thirdparties-docker.sh
b/docker/thirdparties/run-thirdparties-docker.sh
index e1329b76e75..6188b0da963 100755
--- a/docker/thirdparties/run-thirdparties-docker.sh
+++ b/docker/thirdparties/run-thirdparties-docker.sh
@@ -288,8 +288,8 @@ if [[ "${RUN_KAFKA}" -eq 1 ]]; then
declare -a topics=("basic_data" "basic_array_data"
"basic_data_with_errors" "basic_array_data_with_errors" "basic_data_timezone"
"basic_array_data_timezone")
for topic in "${topics[@]}"; do
- echo "docker exec "${container_id}" bash -c echo
'/opt/kafka/bin/kafka-topics.sh --create --bootstrap-server '${ip_host}:19193'
--topic '${topic}'"
- docker exec "${container_id}" bash -c
"/opt/kafka/bin/kafka-topics.sh --create --bootstrap-server '${ip_host}:19193'
--topic '${topic}'"
+ echo "docker exec "${container_id}" bash -c echo
'/opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server
'${ip_host}:19193' --topic '${topic}'"
+ docker exec "${container_id}" bash -c
"/opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server
'${ip_host}:19193' --topic '${topic}'"
done
}
diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy
b/regression-test/pipeline/p0/conf/regression-conf.groovy
index 47fbd411496..c42f83a802c 100644
--- a/regression-test/pipeline/p0/conf/regression-conf.groovy
+++ b/regression-test/pipeline/p0/conf/regression-conf.groovy
@@ -64,9 +64,9 @@ excludeGroups = ""
excludeSuites = "000_the_start_sentinel_do_not_touch," + // keep this line as
the first line
"test_bitmap_filter," +
- "test_routine_load," + // depends on kafka docker which has gone away,
fixing
- "test_routine_load_error," + // depends on kafka docker which has gone
away, fixing
- "test_routine_load_condition," + // depends on kafka docker which has gone
away, fixing
+ //"test_routine_load," + // depends on kafka docker which has gone away,
fixing
+ //"test_routine_load_error," + // depends on kafka docker which has gone
away, fixing
+ //"test_routine_load_condition," + // depends on kafka docker which has
gone away, fixing
"test_dump_image," +
"test_index_failure_injection," +
"test_profile," +
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
