diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml index b090f5ccc02da..7c2ba4b42e0bb 100644 --- a/ci/docker-compose.yml +++ b/ci/docker-compose.yml @@ -189,8 +189,8 @@ services: - FE_SERVERS=fe1:172.121.0.2:9010 - FE_ID=1 ports: - - "18030:8030" - - "19030:9030" + - "8030:8030" + - "9030:9030" networks: mynetwork: ipv4_address: 172.121.0.2 @@ -205,7 +205,7 @@ services: depends_on: - doris-fe-server ports: - - "19050:9050" + - "9050:9050" networks: mynetwork: ipv4_address: 172.121.0.3 diff --git a/ci/scripts/e2e-doris-sink-test.sh b/ci/scripts/e2e-doris-sink-test.sh index efe6a3820823d..0d12d1f4933a2 100755 --- a/ci/scripts/e2e-doris-sink-test.sh +++ b/ci/scripts/e2e-doris-sink-test.sh @@ -27,9 +27,8 @@ echo "--- starting risingwave cluster" cargo make ci-start ci-sink-test sleep 1 - echo "--- create doris table" -apt-get install -y mysql-client +apt-get update -y && apt-get install -y mysql-client sleep 2 mysql -uroot -P 9030 -h doris-fe-server -e "CREATE database demo;use demo; CREATE table demo_bhv_table(v1 int,v2 smallint,v3 bigint,v4 float,v5 double,v6 string,v7 datev2,v8 datetime,v9 boolean) UNIQUE KEY(\`v1\`) diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml index 5f52cbe8c771b..ff8e65fb12c6b 100644 --- a/ci/workflows/main-cron.yml +++ b/ci/workflows/main-cron.yml @@ -718,6 +718,13 @@ steps: timeout_in_minutes: 10 retry: *auto-retry + - label: "set vm_max_map_count_2000000" + if: | + !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null + || build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" + || build.env("CI_STEPS") =~ /(^|,)e2e-doris-sink-tests?(,|$$)/ + command: "sudo sysctl -w vm.max_map_count=2000000" + - label: "end-to-end doris sink test" key: "e2e-doris-sink-tests" command: "ci/scripts/e2e-doris-sink-test.sh -p ci-release" @@ -728,6 +735,7 @@ steps: depends_on: - "build" - "build-other" + - "set vm_max_map_count_2000000" plugins: - docker-compose#v4.9.0: run: sink-doris-env diff --git a/ci/workflows/pull-request.yml b/ci/workflows/pull-request.yml index 66ec85cf8987c..f8e6015c0d2a9 100644 --- a/ci/workflows/pull-request.yml +++ b/ci/workflows/pull-request.yml @@ -307,12 +307,17 @@ steps: timeout_in_minutes: 10 retry: *auto-retry + - label: "set vm_max_map_count_2000000" + if: build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" || build.env("CI_STEPS") =~ /(^|,) e2e-doris-sink-tests?(,|$$)/ + command: "sudo sysctl -w vm.max_map_count=2000000" + - label: "end-to-end doris sink test" if: build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" || build.env("CI_STEPS") =~ /(^|,) e2e-doris-sink-tests?(,|$$)/ command: "ci/scripts/e2e-doris-sink-test.sh -p ci-dev" depends_on: - "build" - "build-other" + - "set vm_max_map_count_2000000" plugins: - docker-compose#v4.9.0: run: sink-doris-env