You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by vh...@apache.org on 2026/06/04 06:43:53 UTC
(hudi) 36/36: fix(integ): drop stale trino-coordinator-1 / trinobase refs after module removal
This is an automated email from the ASF dual-hosted git repository.
voonhous pushed a commit to tag rfc-105-pre-cleanup
in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 045170cc25420f910b17bb372410a06f7b0a83e3
Author: voon <vo...@gmail.com>
AuthorDate: Thu May 28 21:07:47 2026 +0800
fix(integ): drop stale trino-coordinator-1 / trinobase refs after module removal
Removing the trino docker modules in 8fa5aba2f547 deleted the
trino-coordinator-1 / trino-worker-1 services from the compose files
but left depends_on / links entries on the adhoc-1 and adhoc-2
spark adhoc services. docker compose now errors with
service "adhoc-1" depends on undefined service "trino-coordinator-1":
invalid compose project
at integ-test 'up' phase, failing the hudi-integ-test module.
- Drops "trino-coordinator-1" from the links list in both adhoc services
in the amd64 and arm64 compose files.
- Drops the unused TRINO_CLI_CMD export from sparkadhoc/adhoc.sh
(the trino CLI no longer reaches a coordinator at this hostname).
- Cleans the trinobase example commands and image references out of
docker/README.md so a fresh reader is pointed at modules that still
exist (prestobase as the example image).
---
docker/README.md | 18 +++++++++---------
...ocker-compose_hadoop284_hive2310_spark353_amd64.yml | 2 --
...ocker-compose_hadoop284_hive2310_spark353_arm64.yml | 2 --
docker/hoodie/hadoop/sparkadhoc/adhoc.sh | 2 --
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/docker/README.md b/docker/README.md
index f655f42dca8b..2e5e090af4ca 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -25,7 +25,7 @@ docker demo environment.
### Configs for assembling docker images - `/hoodie`
The `/hoodie` folder contains all the configs for assembling necessary docker images. The name and repository of each
-docker image, e.g., `apachehudi/hudi-hadoop_2.8.4-trinobase_368`, is defined in the maven configuration file `pom.xml`.
+docker image, e.g., `apachehudi/hudi-hadoop_2.8.4-prestobase_0.232`, is defined in the maven configuration file `pom.xml`.
### Base images by Java version
@@ -39,9 +39,9 @@ docker image, e.g., `apachehudi/hudi-hadoop_2.8.4-trinobase_368`, is defined in
The legacy Java 8 `base` module under `/hoodie/hadoop/base` is retained for historical reference only; Spark 2.x is no
longer supported and `build_docker_images.sh` never selects it.
-Downstream Dockerfiles (`datanode`, `historyserver`, `hive_base`, `namenode`, `prestobase`, `trinobase`) pick the base
-via the `BASE_IMAGE_TAG` build arg (default `java11`). `build_docker_images.sh` sets it automatically; bare `docker
-build` invocations targeting the Java 17 base must pass `--build-arg BASE_IMAGE_TAG=java17`.
+Downstream Dockerfiles (`datanode`, `historyserver`, `hive_base`, `namenode`, `prestobase`) pick the base via the
+`BASE_IMAGE_TAG` build arg (default `java11`). `build_docker_images.sh` sets it automatically; bare `docker build`
+invocations targeting the Java 17 base must pass `--build-arg BASE_IMAGE_TAG=java17`.
### Docker compose config for the Demo - `/compose`
@@ -63,8 +63,8 @@ To build a single image target, you can run
```shell
mvn clean pre-integration-test -DskipTests -Ddocker.compose.skip=true -Ddocker.build.skip=false -pl :<image_target> -am
-# For example, to build hudi-hadoop-trinobase-docker
-mvn clean pre-integration-test -DskipTests -Ddocker.compose.skip=true -Ddocker.build.skip=false -pl :hudi-hadoop-trinobase-docker -am
+# For example, to build hudi-hadoop-prestobase-docker
+mvn clean pre-integration-test -DskipTests -Ddocker.compose.skip=true -Ddocker.build.skip=false -pl :hudi-hadoop-prestobase-docker -am
```
Alternatively, you can use `docker` cli directly under `hoodie/hadoop` to build images in a faster way. If you use this
@@ -84,8 +84,8 @@ steps in the next section).
```shell
# Run under hoodie/hadoop, the <tag> is optional, "latest" by default
docker build <image_folder_name> -t <hub-user>/<repo-name>[:<tag>]
-# For example, to build trinobase
-docker build trinobase -t apachehudi/hudi-hadoop_2.8.4-trinobase_368
+# For example, to build prestobase
+docker build prestobase -t apachehudi/hudi-hadoop_2.8.4-prestobase_0.232
```
After new images are built, you can run the following script to bring up docker demo with your local images:
@@ -102,7 +102,7 @@ Hud registry designated by its name or tag:
```shell
docker push <hub-user>/<repo-name>:<tag>
# For example
-docker push apachehudi/hudi-hadoop_2.8.4-trinobase_368
+docker push apachehudi/hudi-hadoop_2.8.4-prestobase_0.232
```
You can also easily push the image to the Docker Hub using Docker Desktop app: go to `Images`, search for the image by
diff --git a/docker/compose/docker-compose_hadoop284_hive2310_spark353_amd64.yml b/docker/compose/docker-compose_hadoop284_hive2310_spark353_amd64.yml
index 6e7c3c778e77..da887173053a 100644
--- a/docker/compose/docker-compose_hadoop284_hive2310_spark353_amd64.yml
+++ b/docker/compose/docker-compose_hadoop284_hive2310_spark353_amd64.yml
@@ -258,7 +258,6 @@ services:
- "hive-metastore-postgresql"
- "namenode"
- "presto-coordinator-1"
- - "trino-coordinator-1"
volumes:
- ${HUDI_WS}:/var/hoodie/ws
@@ -282,7 +281,6 @@ services:
- "hive-metastore-postgresql"
- "namenode"
- "presto-coordinator-1"
- - "trino-coordinator-1"
volumes:
- ${HUDI_WS}:/var/hoodie/ws
diff --git a/docker/compose/docker-compose_hadoop284_hive2310_spark353_arm64.yml b/docker/compose/docker-compose_hadoop284_hive2310_spark353_arm64.yml
index 678bc33f0449..e6b7c300e46f 100644
--- a/docker/compose/docker-compose_hadoop284_hive2310_spark353_arm64.yml
+++ b/docker/compose/docker-compose_hadoop284_hive2310_spark353_arm64.yml
@@ -248,7 +248,6 @@ services:
- "hive-metastore-postgresql"
- "namenode"
- "presto-coordinator-1"
- - "trino-coordinator-1"
volumes:
- ${HUDI_WS}:/var/hoodie/ws
@@ -271,7 +270,6 @@ services:
- "hive-metastore-postgresql"
- "namenode"
- "presto-coordinator-1"
- - "trino-coordinator-1"
volumes:
- ${HUDI_WS}:/var/hoodie/ws
diff --git a/docker/hoodie/hadoop/sparkadhoc/adhoc.sh b/docker/hoodie/hadoop/sparkadhoc/adhoc.sh
index 86fbbf4e775a..d2529e9ce165 100644
--- a/docker/hoodie/hadoop/sparkadhoc/adhoc.sh
+++ b/docker/hoodie/hadoop/sparkadhoc/adhoc.sh
@@ -23,12 +23,10 @@
export SPARK_HOME=/opt/spark
export PRESTO_CLI_CMD="/usr/local/bin/presto --server presto-coordinator-1:8090"
-export TRINO_CLI_CMD="/usr/local/bin/trino --server trino-coordinator-1:8091"
date
echo "SPARK HOME is : $SPARK_HOME"
echo "PRESTO CLI CMD is : $PRESTO_CLI_CMD"
-echo "TRINO CLI CMD is : $TRINO_CLI_CMD"
tail -f /dev/null