From 427cfc667ec136a43af34ab3d488ad7b72f2c644 Mon Sep 17 00:00:00 2001 From: Huangjw <1223644280@qq.com> Date: Wed, 6 Dec 2023 13:54:24 +0800 Subject: [PATCH] chore: docker compose to standalone by default (#13814) --- ci/scripts/notify.py | 1 + ci/workflows/integration-tests.yml | 1 + docker/README.md | 12 +- ...one.yml => docker-compose-distributed.yml} | 212 +++++++++++++----- docker/docker-compose.yml | 211 +++++------------ integration_tests/ad-click/docker-compose.yml | 18 +- integration_tests/ad-ctr/docker-compose.yml | 18 +- .../big-query-sink/docker-compose.yml | 20 +- .../docker-compose.yml | 18 +- .../cdn-metrics/docker-compose.yml | 18 +- .../citus-cdc/docker-compose.yml | 18 +- .../clickhouse-sink/docker-compose.yml | 18 +- .../clickstream/docker-compose.yml | 18 +- .../cockroach-sink/docker-compose.yml | 18 +- .../debezium-mongo/docker-compose.yaml | 16 +- .../debezium-mysql/docker-compose.yml | 18 +- .../debezium-postgres/docker-compose.yml | 18 +- .../debezium-sqlserver/docker-compose.yml | 18 +- .../doris-sink/docker-compose.yml | 16 +- .../elasticsearch-sink/docker-compose.yml | 18 +- .../feature-store/docker-compose.yml | 18 +- .../iceberg-cdc/docker-compose.yml | 18 +- .../iceberg-cdc/python/script/config.ini | 2 +- .../iceberg-sink/docker-compose.yml | 18 +- .../kafka-cdc-sink/docker-compose.yml | 18 +- .../kinesis-s3-source/docker-compose.yml | 18 +- .../livestream/docker-compose.yml | 18 +- .../mysql-cdc/docker-compose.yml | 22 +- .../mysql-sink/docker-compose.yml | 18 +- .../pinot-sink/docker-compose.yml | 18 +- .../postgres-cdc/docker-compose.yml | 20 +- .../postgres-sink/docker-compose.yml | 18 +- .../presto-trino/docker-compose.yml | 18 +- .../presto-trino/etc/risingwave.properties | 2 +- .../prometheus/docker-compose.yml | 18 +- integration_tests/prometheus/prometheus.yaml | 6 +- .../redis-sink/docker-compose.yml | 18 +- .../schema-registry/docker-compose.yml | 18 +- .../starrocks-sink/docker-compose.yml | 18 +- integration_tests/superset/docker-compose.yml | 18 +- .../tidb-cdc-sink/docker-compose.yml | 18 +- .../twitter-pulsar/docker-compose.yml | 18 +- integration_tests/twitter/docker-compose.yml | 18 +- .../upsert-avro/docker-compose.yml | 18 +- integration_tests/vector/docker-compose.yml | 16 +- 45 files changed, 355 insertions(+), 760 deletions(-) rename docker/{docker-compose-standalone.yml => docker-compose-distributed.yml} (63%) diff --git a/ci/scripts/notify.py b/ci/scripts/notify.py index 0bff5b18552bd..36f4acf1ff28f 100755 --- a/ci/scripts/notify.py +++ b/ci/scripts/notify.py @@ -55,6 +55,7 @@ "elasticsearch-sink-json": ["xinhao"], "redis-sink-json": ["xinhao"], "big-query-sink-json": ["xinhao"], + "vector-json": ["bohan"], } def get_failed_tests(get_test_status, test_map): diff --git a/ci/workflows/integration-tests.yml b/ci/workflows/integration-tests.yml index 67589429a7df0..91ff874226e88 100644 --- a/ci/workflows/integration-tests.yml +++ b/ci/workflows/integration-tests.yml @@ -5,6 +5,7 @@ auto-retry: &auto-retry limit: 3 steps: + # You may update `gen-integration-test-yaml.py` to add integration test case - label: "gen and upload integration test pipeline" command: "ci/scripts/gen-integration-test-yaml.py" diff --git a/docker/README.md b/docker/README.md index 64c2bb6e844dc..865f7c64c5183 100644 --- a/docker/README.md +++ b/docker/README.md @@ -45,14 +45,22 @@ To start a RisingWave playground, run docker run -it --pull=always -p 4566:4566 -p 5691:5691 ghcr.io/risingwavelabs/risingwave:latest playground ``` -### minio -To start a RisingWave cluster with minio backend, run +### standalone minio +To start a RisingWave standalone mode with minio backend, run ``` # Start all components docker-compose up ``` +### distributed cluster minio +To start a RisingWave cluster with minio backend, run + +``` +# Start all components +docker-compose -f docker-compose-distributed.yml up +``` + It will start a minio, a meta node, a compute node, a frontend, a compactor, a prometheus and a redpanda instance. ### s3 and other s3-compatible storage backend diff --git a/docker/docker-compose-standalone.yml b/docker/docker-compose-distributed.yml similarity index 63% rename from docker/docker-compose-standalone.yml rename to docker/docker-compose-distributed.yml index 3cac6d250cb72..ad54e4895687f 100644 --- a/docker/docker-compose-standalone.yml +++ b/docker/docker-compose-distributed.yml @@ -3,84 +3,92 @@ version: "3" x-image: &image image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.4.0} services: - risingwave-standalone: + compactor-0: <<: *image - command: "standalone --meta-opts=\" \ - --listen-addr 0.0.0.0:5690 \ - --advertise-addr 0.0.0.0:5690 \ - --dashboard-host 0.0.0.0:5691 \ - --prometheus-host 0.0.0.0:1250 \ - --connector-rpc-endpoint 0.0.0.0:50051 \ - --backend etcd \ - --etcd-endpoints etcd-0:2388 \ - --state-store hummock+minio://hummockadmin:hummockadmin@minio-0:9301/hummock001 \ - --data-directory hummock_001 \ - --config-path /risingwave.toml\" \ - --compute-opts=\" \ - --config-path /risingwave.toml \ - --listen-addr 0.0.0.0:5688 \ - --prometheus-listener-addr 0.0.0.0:1222 \ - --advertise-addr 0.0.0.0:5688 \ - --async-stack-trace verbose \ - --connector-rpc-endpoint 0.0.0.0:50051 \ - #--parallelism 4 \ - #--total-memory-bytes 8589934592 \ - --role both \ - --meta-address http://0.0.0.0:5690\" \ - --frontend-opts=\" \ - --config-path /risingwave.toml \ - --listen-addr 0.0.0.0:4566 \ - --advertise-addr 0.0.0.0:4566 \ - --prometheus-listener-addr 0.0.0.0:2222 \ - --health-check-listener-addr 0.0.0.0:6786 \ - --meta-addr http://0.0.0.0:5690\" \ - --compactor-opts=\" \ - --listen-addr 0.0.0.0:6660 \ - --prometheus-listener-addr 0.0.0.0:1260 \ - --advertise-addr 0.0.0.0:6660 \ - --meta-address http://0.0.0.0:5690\"" + command: + - compactor-node + - "--listen-addr" + - "0.0.0.0:6660" + - "--advertise-addr" + - "compactor-0:6660" + - "--prometheus-listener-addr" + - "0.0.0.0:1260" + - "--meta-address" + - "http://meta-node-0:5690" + - "--config-path" + - /risingwave.toml expose: - "6660" - "1260" - - "4566" + ports: [] + depends_on: + - meta-node-0 + # - minio-0 + volumes: + - "./risingwave.toml:/risingwave.toml" + environment: + RUST_BACKTRACE: "1" + # If ENABLE_TELEMETRY is not set, telemetry will start by default + ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true} + container_name: compactor-0 + healthcheck: + test: + - CMD-SHELL + - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/6660; exit $$?;' + interval: 1s + timeout: 5s + retries: 5 + restart: always + deploy: + resources: + limits: + memory: 2G + reservations: + memory: 1G + compute-node-0: + <<: *image + command: + - compute-node + - "--listen-addr" + - "0.0.0.0:5688" + - "--advertise-addr" + - "compute-node-0:5688" + - "--prometheus-listener-addr" + - "0.0.0.0:1222" + - "--meta-address" + - "http://meta-node-0:5690" + - "--config-path" + - /risingwave.toml + expose: - "5688" - "1222" - - "5690" - - "1250" - - "5691" - ports: - - "4566:4566" - - "5690:5690" - - "5691:5691" + ports: [] depends_on: - - etcd-0 - - minio-0 + - meta-node-0 + # - minio-0 volumes: - "./risingwave.toml:/risingwave.toml" environment: RUST_BACKTRACE: "1" # If ENABLE_TELEMETRY is not set, telemetry will start by default ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true} - container_name: risingwave-standalone + container_name: compute-node-0 healthcheck: test: - CMD-SHELL - - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/6660; exit $$?;' - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5688; exit $$?;' - - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/4566; exit $$?;' - - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5690; exit $$?;' interval: 1s timeout: 5s + retries: 5 restart: always deploy: resources: limits: - memory: 28G + memory: 26G reservations: - memory: 28G - + memory: 26G etcd-0: - image: "quay.io/coreos/etcd:v3.5.7" + image: "quay.io/coreos/etcd:v3.5.10" command: - /usr/local/bin/etcd - "--listen-client-urls" @@ -128,7 +136,47 @@ services: timeout: 5s retries: 5 restart: always - + frontend-node-0: + <<: *image + command: + - frontend-node + - "--listen-addr" + - "0.0.0.0:4566" + - "--meta-addr" + - "http://meta-node-0:5690" + - "--advertise-addr" + - "frontend-node-0:4566" + - "--config-path" + - /risingwave.toml + - "--prometheus-listener-addr" + - "0.0.0.0:2222" + expose: + - "4566" + ports: + - "4566:4566" + depends_on: + - meta-node-0 + volumes: + - "./risingwave.toml:/risingwave.toml" + environment: + RUST_BACKTRACE: "1" + # If ENABLE_TELEMETRY is not set, telemetry will start by default + ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true} + container_name: frontend-node-0 + healthcheck: + test: + - CMD-SHELL + - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/4566; exit $$?;' + interval: 1s + timeout: 5s + retries: 5 + restart: always + deploy: + resources: + limits: + memory: 2G + reservations: + memory: 1G grafana-0: image: "grafana/grafana-oss:latest" command: [] @@ -153,7 +201,58 @@ services: timeout: 5s retries: 5 restart: always - + meta-node-0: + <<: *image + command: + - meta-node + - "--listen-addr" + - "0.0.0.0:5690" + - "--advertise-addr" + - "meta-node-0:5690" + - "--dashboard-host" + - "0.0.0.0:5691" + - "--prometheus-host" + - "0.0.0.0:1250" + - "--backend" + - etcd + - "--etcd-endpoints" + - "etcd-0:2388" + - "--state-store" + - "hummock+minio://hummockadmin:hummockadmin@minio-0:9301/hummock001" + - "--data-directory" + - "hummock_001" + - "--config-path" + - /risingwave.toml + expose: + - "5690" + - "1250" + - "5691" + ports: + - "5690:5690" + - "5691:5691" + depends_on: + - "etcd-0" + volumes: + - "./risingwave.toml:/risingwave.toml" + environment: + RUST_BACKTRACE: "1" + # If ENABLE_TELEMETRY is not set, telemetry will start by default + ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true} + container_name: meta-node-0 + healthcheck: + test: + - CMD-SHELL + - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5690; exit $$?;' + interval: 1s + timeout: 5s + retries: 5 + restart: always + deploy: + resources: + limits: + memory: 2G + reservations: + memory: 1G minio-0: image: "quay.io/minio/minio:latest" command: @@ -199,7 +298,6 @@ services: timeout: 5s retries: 5 restart: always - prometheus-0: image: "prom/prometheus:latest" command: @@ -227,7 +325,6 @@ services: timeout: 5s retries: 5 restart: always - message_queue: image: "docker.vectorized.io/vectorized/redpanda:latest" command: @@ -278,4 +375,3 @@ volumes: external: false message_queue: external: false - diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ad54e4895687f..fa278d4f9798f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -3,92 +3,84 @@ version: "3" x-image: &image image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.4.0} services: - compactor-0: + risingwave-standalone: <<: *image - command: - - compactor-node - - "--listen-addr" - - "0.0.0.0:6660" - - "--advertise-addr" - - "compactor-0:6660" - - "--prometheus-listener-addr" - - "0.0.0.0:1260" - - "--meta-address" - - "http://meta-node-0:5690" - - "--config-path" - - /risingwave.toml + command: "standalone --meta-opts=\" \ + --listen-addr 0.0.0.0:5690 \ + --advertise-addr 0.0.0.0:5690 \ + --dashboard-host 0.0.0.0:5691 \ + --prometheus-host 0.0.0.0:1250 \ + --connector-rpc-endpoint 0.0.0.0:50051 \ + --backend etcd \ + --etcd-endpoints etcd-0:2388 \ + --state-store hummock+minio://hummockadmin:hummockadmin@minio-0:9301/hummock001 \ + --data-directory hummock_001 \ + --config-path /risingwave.toml\" \ + --compute-opts=\" \ + --config-path /risingwave.toml \ + --listen-addr 0.0.0.0:5688 \ + --prometheus-listener-addr 0.0.0.0:1222 \ + --advertise-addr 0.0.0.0:5688 \ + --async-stack-trace verbose \ + --connector-rpc-endpoint 0.0.0.0:50051 \ + #--parallelism 4 \ + #--total-memory-bytes 8589934592 \ + --role both \ + --meta-address http://0.0.0.0:5690\" \ + --frontend-opts=\" \ + --config-path /risingwave.toml \ + --listen-addr 0.0.0.0:4566 \ + --advertise-addr 0.0.0.0:4566 \ + --prometheus-listener-addr 0.0.0.0:2222 \ + --health-check-listener-addr 0.0.0.0:6786 \ + --meta-addr http://0.0.0.0:5690\" \ + --compactor-opts=\" \ + --listen-addr 0.0.0.0:6660 \ + --prometheus-listener-addr 0.0.0.0:1260 \ + --advertise-addr 0.0.0.0:6660 \ + --meta-address http://0.0.0.0:5690\"" expose: - "6660" - "1260" - ports: [] - depends_on: - - meta-node-0 - # - minio-0 - volumes: - - "./risingwave.toml:/risingwave.toml" - environment: - RUST_BACKTRACE: "1" - # If ENABLE_TELEMETRY is not set, telemetry will start by default - ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true} - container_name: compactor-0 - healthcheck: - test: - - CMD-SHELL - - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/6660; exit $$?;' - interval: 1s - timeout: 5s - retries: 5 - restart: always - deploy: - resources: - limits: - memory: 2G - reservations: - memory: 1G - compute-node-0: - <<: *image - command: - - compute-node - - "--listen-addr" - - "0.0.0.0:5688" - - "--advertise-addr" - - "compute-node-0:5688" - - "--prometheus-listener-addr" - - "0.0.0.0:1222" - - "--meta-address" - - "http://meta-node-0:5690" - - "--config-path" - - /risingwave.toml - expose: + - "4566" - "5688" - "1222" - ports: [] + - "5690" + - "1250" + - "5691" + ports: + - "4566:4566" + - "5690:5690" + - "5691:5691" depends_on: - - meta-node-0 - # - minio-0 + - etcd-0 + - minio-0 volumes: - "./risingwave.toml:/risingwave.toml" environment: RUST_BACKTRACE: "1" # If ENABLE_TELEMETRY is not set, telemetry will start by default ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true} - container_name: compute-node-0 + container_name: risingwave-standalone healthcheck: test: - CMD-SHELL + - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/6660; exit $$?;' - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5688; exit $$?;' + - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/4566; exit $$?;' + - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5690; exit $$?;' interval: 1s timeout: 5s - retries: 5 restart: always deploy: resources: limits: - memory: 26G + memory: 28G reservations: - memory: 26G + memory: 28G + etcd-0: - image: "quay.io/coreos/etcd:v3.5.10" + image: "quay.io/coreos/etcd:v3.5.7" command: - /usr/local/bin/etcd - "--listen-client-urls" @@ -136,47 +128,7 @@ services: timeout: 5s retries: 5 restart: always - frontend-node-0: - <<: *image - command: - - frontend-node - - "--listen-addr" - - "0.0.0.0:4566" - - "--meta-addr" - - "http://meta-node-0:5690" - - "--advertise-addr" - - "frontend-node-0:4566" - - "--config-path" - - /risingwave.toml - - "--prometheus-listener-addr" - - "0.0.0.0:2222" - expose: - - "4566" - ports: - - "4566:4566" - depends_on: - - meta-node-0 - volumes: - - "./risingwave.toml:/risingwave.toml" - environment: - RUST_BACKTRACE: "1" - # If ENABLE_TELEMETRY is not set, telemetry will start by default - ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true} - container_name: frontend-node-0 - healthcheck: - test: - - CMD-SHELL - - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/4566; exit $$?;' - interval: 1s - timeout: 5s - retries: 5 - restart: always - deploy: - resources: - limits: - memory: 2G - reservations: - memory: 1G + grafana-0: image: "grafana/grafana-oss:latest" command: [] @@ -201,58 +153,7 @@ services: timeout: 5s retries: 5 restart: always - meta-node-0: - <<: *image - command: - - meta-node - - "--listen-addr" - - "0.0.0.0:5690" - - "--advertise-addr" - - "meta-node-0:5690" - - "--dashboard-host" - - "0.0.0.0:5691" - - "--prometheus-host" - - "0.0.0.0:1250" - - "--backend" - - etcd - - "--etcd-endpoints" - - "etcd-0:2388" - - "--state-store" - - "hummock+minio://hummockadmin:hummockadmin@minio-0:9301/hummock001" - - "--data-directory" - - "hummock_001" - - "--config-path" - - /risingwave.toml - expose: - - "5690" - - "1250" - - "5691" - ports: - - "5690:5690" - - "5691:5691" - depends_on: - - "etcd-0" - volumes: - - "./risingwave.toml:/risingwave.toml" - environment: - RUST_BACKTRACE: "1" - # If ENABLE_TELEMETRY is not set, telemetry will start by default - ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true} - container_name: meta-node-0 - healthcheck: - test: - - CMD-SHELL - - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5690; exit $$?;' - interval: 1s - timeout: 5s - retries: 5 - restart: always - deploy: - resources: - limits: - memory: 2G - reservations: - memory: 1G + minio-0: image: "quay.io/minio/minio:latest" command: @@ -298,6 +199,7 @@ services: timeout: 5s retries: 5 restart: always + prometheus-0: image: "prom/prometheus:latest" command: @@ -325,6 +227,7 @@ services: timeout: 5s retries: 5 restart: always + message_queue: image: "docker.vectorized.io/vectorized/redpanda:latest" command: diff --git a/integration_tests/ad-click/docker-compose.yml b/integration_tests/ad-click/docker-compose.yml index ab8f175db1252..f1a2bbc8419cb 100644 --- a/integration_tests/ad-click/docker-compose.yml +++ b/integration_tests/ad-click/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -47,7 +35,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/ad-ctr/docker-compose.yml b/integration_tests/ad-ctr/docker-compose.yml index bd12b521d53b5..fb297a8fec8ab 100644 --- a/integration_tests/ad-ctr/docker-compose.yml +++ b/integration_tests/ad-ctr/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -47,7 +35,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/big-query-sink/docker-compose.yml b/integration_tests/big-query-sink/docker-compose.yml index 81955b6dfb680..ca16ca8f90b3b 100644 --- a/integration_tests/big-query-sink/docker-compose.yml +++ b/integration_tests/big-query-sink/docker-compose.yml @@ -1,34 +1,20 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone volumes: - "../../gcp-rwctest.json:/gcp-rwctest.json" etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 - volumes: - - "../../gcp-rwctest.json:/gcp-rwctest.json" minio-0: extends: file: ../../docker/docker-compose.yml @@ -44,7 +30,7 @@ services: - "../../gcp-rwctest.json:/gcp-rwctest.json" volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/cassandra-and-scylladb-sink/docker-compose.yml b/integration_tests/cassandra-and-scylladb-sink/docker-compose.yml index 784282b291f94..425e086c56ba0 100644 --- a/integration_tests/cassandra-and-scylladb-sink/docker-compose.yml +++ b/integration_tests/cassandra-and-scylladb-sink/docker-compose.yml @@ -18,30 +18,18 @@ services: - CASSANDRA_CLUSTER_NAME=cloudinfra volumes: - "./prepare_cassandra_and_scylladb.sql:/prepare_cassandra_and_scylladb.sql" - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -55,7 +43,7 @@ services: file: ../../docker/docker-compose.yml service: message_queue volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/cdn-metrics/docker-compose.yml b/integration_tests/cdn-metrics/docker-compose.yml index 617566382b7f7..69eb63a448eb2 100644 --- a/integration_tests/cdn-metrics/docker-compose.yml +++ b/integration_tests/cdn-metrics/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -47,7 +35,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/citus-cdc/docker-compose.yml b/integration_tests/citus-cdc/docker-compose.yml index a77b4aa18bcaf..d77e0e80dbfa9 100644 --- a/integration_tests/citus-cdc/docker-compose.yml +++ b/integration_tests/citus-cdc/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -100,7 +88,7 @@ services: command: tpch prepare --sf 1 --threads 4 -d postgres -U myuser -p '123456' -H citus-master -D mydb -P 5432 --conn-params sslmode=disable restart: on-failure volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/clickhouse-sink/docker-compose.yml b/integration_tests/clickhouse-sink/docker-compose.yml index 15f43d46c22a1..8129c7d618daf 100644 --- a/integration_tests/clickhouse-sink/docker-compose.yml +++ b/integration_tests/clickhouse-sink/docker-compose.yml @@ -13,30 +13,18 @@ services: - 9009 volumes: - ./clickhouse-sql:/opt/clickhouse/clickhouse-sql - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -50,7 +38,7 @@ services: file: ../../docker/docker-compose.yml service: message_queue volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/clickstream/docker-compose.yml b/integration_tests/clickstream/docker-compose.yml index b7a1573d25253..faf66b770af7d 100644 --- a/integration_tests/clickstream/docker-compose.yml +++ b/integration_tests/clickstream/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -47,7 +35,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/cockroach-sink/docker-compose.yml b/integration_tests/cockroach-sink/docker-compose.yml index 295f07170adb2..cde3ef8742815 100644 --- a/integration_tests/cockroach-sink/docker-compose.yml +++ b/integration_tests/cockroach-sink/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -67,7 +55,7 @@ services: container_name: prepare_postgres restart: on-failure volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/debezium-mongo/docker-compose.yaml b/integration_tests/debezium-mongo/docker-compose.yaml index 9ae230acef843..afa753440f77d 100644 --- a/integration_tests/debezium-mongo/docker-compose.yaml +++ b/integration_tests/debezium-mongo/docker-compose.yaml @@ -1,30 +1,18 @@ version: '3.1' services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml diff --git a/integration_tests/debezium-mysql/docker-compose.yml b/integration_tests/debezium-mysql/docker-compose.yml index a5e5ae53384db..f3bc6b15b470e 100644 --- a/integration_tests/debezium-mysql/docker-compose.yml +++ b/integration_tests/debezium-mysql/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -107,7 +95,7 @@ services: volumes: message_queue: external: false - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/debezium-postgres/docker-compose.yml b/integration_tests/debezium-postgres/docker-compose.yml index 2c4981ba23271..89748e45b44dd 100644 --- a/integration_tests/debezium-postgres/docker-compose.yml +++ b/integration_tests/debezium-postgres/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -119,7 +107,7 @@ services: volumes: message_queue: external: false - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/debezium-sqlserver/docker-compose.yml b/integration_tests/debezium-sqlserver/docker-compose.yml index 338b83e2926ba..13cf6a7776ca5 100644 --- a/integration_tests/debezium-sqlserver/docker-compose.yml +++ b/integration_tests/debezium-sqlserver/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -104,7 +92,7 @@ services: volumes: message_queue: external: false - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/doris-sink/docker-compose.yml b/integration_tests/doris-sink/docker-compose.yml index 697a6ac1880ea..44498e14962ed 100644 --- a/integration_tests/doris-sink/docker-compose.yml +++ b/integration_tests/doris-sink/docker-compose.yml @@ -28,56 +28,56 @@ services: ipv4_address: 172.21.0.3 compactor-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: compactor-0 networks: mynetwork: ipv4_address: 172.21.0.4 compute-node-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: compute-node-0 networks: mynetwork: ipv4_address: 172.21.0.5 etcd-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: etcd-0 networks: mynetwork: ipv4_address: 172.21.0.6 frontend-node-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: frontend-node-0 networks: mynetwork: ipv4_address: 172.21.0.7 grafana-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: grafana-0 networks: mynetwork: ipv4_address: 172.21.0.8 meta-node-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: meta-node-0 networks: mynetwork: ipv4_address: 172.21.0.9 minio-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: minio-0 networks: mynetwork: ipv4_address: 172.21.0.10 prometheus-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: prometheus-0 networks: mynetwork: diff --git a/integration_tests/elasticsearch-sink/docker-compose.yml b/integration_tests/elasticsearch-sink/docker-compose.yml index 593d19850fa14..195e8d0070eb8 100644 --- a/integration_tests/elasticsearch-sink/docker-compose.yml +++ b/integration_tests/elasticsearch-sink/docker-compose.yml @@ -25,30 +25,18 @@ services: memory: 1G ports: - 9201:9200 - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -58,7 +46,7 @@ services: file: ../../docker/docker-compose.yml service: prometheus-0 volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/feature-store/docker-compose.yml b/integration_tests/feature-store/docker-compose.yml index f4c7e898118aa..b1767f8d04864 100644 --- a/integration_tests/feature-store/docker-compose.yml +++ b/integration_tests/feature-store/docker-compose.yml @@ -55,11 +55,11 @@ services: ZOOKEEPER_TICK_TIME: 2000 compactor-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: compactor-0 compute-node-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: compute-node-0 volumes: - "./server/udf.py:/udf.py" @@ -75,19 +75,15 @@ services: - ".log:/opt/feature-store/.log" etcd-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: grafana-0 meta-node-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: meta-node-0 ports: - "8815:8815" @@ -95,11 +91,11 @@ services: [kafka] minio-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: minio-0 prometheus-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: prometheus-0 volumes: etcd-0: diff --git a/integration_tests/iceberg-cdc/docker-compose.yml b/integration_tests/iceberg-cdc/docker-compose.yml index a41441eb7f0a5..e483003907746 100644 --- a/integration_tests/iceberg-cdc/docker-compose.yml +++ b/integration_tests/iceberg-cdc/docker-compose.yml @@ -1,26 +1,14 @@ version: '3.8' services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml @@ -137,7 +125,7 @@ services: command: [ "bash", "/spark/spark-connect-server.sh" ] volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/iceberg-cdc/python/script/config.ini b/integration_tests/iceberg-cdc/python/script/config.ini index d9c7331c35da8..71f819a909508 100644 --- a/integration_tests/iceberg-cdc/python/script/config.ini +++ b/integration_tests/iceberg-cdc/python/script/config.ini @@ -4,5 +4,5 @@ url=sc://spark:15002 [risingwave] db=dev user=root -host=frontend-node-0 +host=risingwave-standalone port=4566 diff --git a/integration_tests/iceberg-sink/docker-compose.yml b/integration_tests/iceberg-sink/docker-compose.yml index c6e515d9ec188..c7182b873d85b 100644 --- a/integration_tests/iceberg-sink/docker-compose.yml +++ b/integration_tests/iceberg-sink/docker-compose.yml @@ -49,30 +49,18 @@ services: presto: build: ./presto-with-iceberg container_name: presto - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -171,7 +159,7 @@ services: _AIRFLOW_WWW_USER_PASSWORD: 'airflow' volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/kafka-cdc-sink/docker-compose.yml b/integration_tests/kafka-cdc-sink/docker-compose.yml index fb90ce8b0811c..c8c31d7762cf6 100644 --- a/integration_tests/kafka-cdc-sink/docker-compose.yml +++ b/integration_tests/kafka-cdc-sink/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -143,7 +131,7 @@ services: container_name: connect volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/kinesis-s3-source/docker-compose.yml b/integration_tests/kinesis-s3-source/docker-compose.yml index 1eb9e52915847..8441d0aaa1d6b 100644 --- a/integration_tests/kinesis-s3-source/docker-compose.yml +++ b/integration_tests/kinesis-s3-source/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -60,7 +48,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/livestream/docker-compose.yml b/integration_tests/livestream/docker-compose.yml index df1f39773d070..1f3e0736a4def 100644 --- a/integration_tests/livestream/docker-compose.yml +++ b/integration_tests/livestream/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -47,7 +35,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/mysql-cdc/docker-compose.yml b/integration_tests/mysql-cdc/docker-compose.yml index 81fe3037a98a8..5cd3003669d7b 100644 --- a/integration_tests/mysql-cdc/docker-compose.yml +++ b/integration_tests/mysql-cdc/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -64,14 +52,14 @@ services: depends_on: mysql_prepare: condition: service_completed_successfully - frontend-node-0: + risingwave-standalone: condition: service_healthy volumes: - "./compatibility-rw.sql:/compatibility-rw.sql" command: - /bin/sh - -c - - "psql postgresql://root:@frontend-node-0:4566/dev < /compatibility-rw.sql" + - "psql postgresql://root:@risingwave-standalone:4566/dev < /compatibility-rw.sql" datagen_tpch: image: ghcr.io/risingwavelabs/go-tpc:v0.1 depends_on: @@ -80,7 +68,7 @@ services: container_name: datagen_tpch restart: on-failure volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/mysql-sink/docker-compose.yml b/integration_tests/mysql-sink/docker-compose.yml index 08d669889b2c8..9b946514eb4aa 100644 --- a/integration_tests/mysql-sink/docker-compose.yml +++ b/integration_tests/mysql-sink/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -74,7 +62,7 @@ services: container_name: prepare_mysql restart: on-failure volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/pinot-sink/docker-compose.yml b/integration_tests/pinot-sink/docker-compose.yml index 57cafc1ef0ed7..3faf769de9e67 100644 --- a/integration_tests/pinot-sink/docker-compose.yml +++ b/integration_tests/pinot-sink/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -92,7 +80,7 @@ services: ZOOKEEPER_CLIENT_PORT: 2181 ZOOKEEPER_TICK_TIME: 2000 volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/postgres-cdc/docker-compose.yml b/integration_tests/postgres-cdc/docker-compose.yml index 5b98b7ba2fcd2..1898d20a8c9ae 100644 --- a/integration_tests/postgres-cdc/docker-compose.yml +++ b/integration_tests/postgres-cdc/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -61,7 +49,7 @@ services: - "psql postgresql://myuser:123456@postgres:5432/mydb < postgres_prepare.sql && psql postgresql://myuser:123456@postgres:5432/mydb < compatibility-pg.sql && sleep 5 && - psql postgresql://root:@frontend-node-0:4566/dev < compatibility-rw.sql" + psql postgresql://root:@risingwave-standalone:4566/dev < compatibility-rw.sql" volumes: - "./postgres_prepare.sql:/postgres_prepare.sql" - "./compatibility-pg.sql:/compatibility-pg.sql" @@ -88,7 +76,7 @@ services: file: ../../docker/docker-compose.yml service: message_queue volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/postgres-sink/docker-compose.yml b/integration_tests/postgres-sink/docker-compose.yml index 49e3c18a9c733..a5b8465d7c915 100644 --- a/integration_tests/postgres-sink/docker-compose.yml +++ b/integration_tests/postgres-sink/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -77,7 +65,7 @@ services: container_name: prepare_postgres restart: on-failure volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/presto-trino/docker-compose.yml b/integration_tests/presto-trino/docker-compose.yml index f49b55c2245b1..6e6f21508eabd 100644 --- a/integration_tests/presto-trino/docker-compose.yml +++ b/integration_tests/presto-trino/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -56,7 +44,7 @@ services: profiles: [ "client" ] entrypoint: [ "presto-cli", "--server", "presto:8080", "--catalog", "risingwave", "--schema", "public" ] volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/presto-trino/etc/risingwave.properties b/integration_tests/presto-trino/etc/risingwave.properties index 9731e53cec597..b00bac045da1c 100644 --- a/integration_tests/presto-trino/etc/risingwave.properties +++ b/integration_tests/presto-trino/etc/risingwave.properties @@ -1,5 +1,5 @@ connector.name=postgresql -connection-url=jdbc:postgresql://frontend-node-0:4566/dev +connection-url=jdbc:postgresql://risingwave-standalone:4566/dev connection-user=root connection-password=secret case-insensitive-name-matching=true \ No newline at end of file diff --git a/integration_tests/prometheus/docker-compose.yml b/integration_tests/prometheus/docker-compose.yml index 2afd1fef12d45..0beb75839d4cd 100644 --- a/integration_tests/prometheus/docker-compose.yml +++ b/integration_tests/prometheus/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -77,7 +65,7 @@ services: - prometheus-0 - message_queue volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/prometheus/prometheus.yaml b/integration_tests/prometheus/prometheus.yaml index 4c0c115e03be7..155f09b1813ad 100644 --- a/integration_tests/prometheus/prometheus.yaml +++ b/integration_tests/prometheus/prometheus.yaml @@ -10,11 +10,11 @@ scrape_configs: - job_name: compute static_configs: - - targets: ["compute-node-0:1222"] + - targets: ["risingwave-standalone:1222"] - job_name: meta static_configs: - - targets: ["meta-node-0:1250"] + - targets: ["risingwave-standalone:1250"] - job_name: minio metrics_path: /minio/v2/metrics/cluster @@ -23,7 +23,7 @@ scrape_configs: - job_name: compactor static_configs: - - targets: ["compactor-0:1260"] + - targets: ["risingwave-standalone:1260"] - job_name: etcd static_configs: diff --git a/integration_tests/redis-sink/docker-compose.yml b/integration_tests/redis-sink/docker-compose.yml index 1bb0093149aa5..0fd33048a29bf 100644 --- a/integration_tests/redis-sink/docker-compose.yml +++ b/integration_tests/redis-sink/docker-compose.yml @@ -12,30 +12,18 @@ services: interval: 5s timeout: 30s retries: 50 - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -49,7 +37,7 @@ services: file: ../../docker/docker-compose.yml service: message_queue volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/schema-registry/docker-compose.yml b/integration_tests/schema-registry/docker-compose.yml index ac9b6b26aeaf7..1d41f169cd752 100644 --- a/integration_tests/schema-registry/docker-compose.yml +++ b/integration_tests/schema-registry/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -53,7 +41,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/starrocks-sink/docker-compose.yml b/integration_tests/starrocks-sink/docker-compose.yml index 1933853c16915..520b678a24def 100644 --- a/integration_tests/starrocks-sink/docker-compose.yml +++ b/integration_tests/starrocks-sink/docker-compose.yml @@ -30,30 +30,18 @@ services: container_name: starrocks-be depends_on: - starrocks-fe - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -63,7 +51,7 @@ services: file: ../../docker/docker-compose.yml service: prometheus-0 volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/superset/docker-compose.yml b/integration_tests/superset/docker-compose.yml index f8309c4ca2abb..271e79755aab3 100644 --- a/integration_tests/superset/docker-compose.yml +++ b/integration_tests/superset/docker-compose.yml @@ -11,30 +11,18 @@ x-superset-volumes: version: "3.7" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -122,7 +110,7 @@ volumes: external: false redis: external: false - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/tidb-cdc-sink/docker-compose.yml b/integration_tests/tidb-cdc-sink/docker-compose.yml index aba0956414500..70481ab6dbb5c 100644 --- a/integration_tests/tidb-cdc-sink/docker-compose.yml +++ b/integration_tests/tidb-cdc-sink/docker-compose.yml @@ -1,30 +1,18 @@ --- version: '3' services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -219,7 +207,7 @@ services: restart: on-failure volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/twitter-pulsar/docker-compose.yml b/integration_tests/twitter-pulsar/docker-compose.yml index eed9b2582f3ed..8061425d48d38 100644 --- a/integration_tests/twitter-pulsar/docker-compose.yml +++ b/integration_tests/twitter-pulsar/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -52,7 +40,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/twitter/docker-compose.yml b/integration_tests/twitter/docker-compose.yml index 7ac085e0a17ee..e5637b7f2664f 100644 --- a/integration_tests/twitter/docker-compose.yml +++ b/integration_tests/twitter/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -47,7 +35,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/upsert-avro/docker-compose.yml b/integration_tests/upsert-avro/docker-compose.yml index 6e9f6f4ff6cf7..695c8f8fcb043 100644 --- a/integration_tests/upsert-avro/docker-compose.yml +++ b/integration_tests/upsert-avro/docker-compose.yml @@ -1,30 +1,18 @@ --- version: "3" services: - compactor-0: + risingwave-standalone: extends: file: ../../docker/docker-compose.yml - service: compactor-0 - compute-node-0: - extends: - file: ../../docker/docker-compose.yml - service: compute-node-0 + service: risingwave-standalone etcd-0: extends: file: ../../docker/docker-compose.yml service: etcd-0 - frontend-node-0: - extends: - file: ../../docker/docker-compose.yml - service: frontend-node-0 grafana-0: extends: file: ../../docker/docker-compose.yml service: grafana-0 - meta-node-0: - extends: - file: ../../docker/docker-compose.yml - service: meta-node-0 minio-0: extends: file: ../../docker/docker-compose.yml @@ -53,7 +41,7 @@ services: restart: always container_name: datagen volumes: - compute-node-0: + risingwave-standalone: external: false etcd-0: external: false diff --git a/integration_tests/vector/docker-compose.yml b/integration_tests/vector/docker-compose.yml index caa45a2087966..1bc51aec64200 100644 --- a/integration_tests/vector/docker-compose.yml +++ b/integration_tests/vector/docker-compose.yml @@ -3,35 +3,35 @@ version: "3" services: compactor-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: compactor-0 compute-node-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: compute-node-0 etcd-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: etcd-0 frontend-node-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: frontend-node-0 grafana-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: grafana-0 meta-node-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: meta-node-0 minio-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: minio-0 prometheus-0: extends: - file: ../../docker/docker-compose.yml + file: ../../docker/docker-compose-distributed.yml service: prometheus-0 vector: