Add launcher and create tar for trino-gateway

Author: anilsomisetty

docker/Dockerfile

@@ -59,14 +59,16 @@ RUN \
     set -xeu && \
     groupadd trino --gid 1000 && \
     useradd trino --uid 1000 --gid 1000 --create-home && \
-    mkdir -p /usr/lib/trino-gateway /etc/trino-gateway && \
-    chown -R "trino:trino" /usr/lib/trino-gateway /etc/trino-gateway
+    mkdir -p /usr/lib/trino-gateway /data/trino-gateway && \
+    chown -R "trino:trino" /usr/lib/trino-gateway /data/trino-gateway
 
-COPY --chown=trino:trino gateway-ha /usr/lib/trino-gateway
+ARG TRINO_GATEWAY_VERSION
+COPY --chown=trino:trino trino-gateway-server-${TRINO_GATEWAY_VERSION} /usr/lib/trino-gateway
+COPY --chown=trino:trino default/etc /etc/trino-gateway
 
 EXPOSE 8080
 USER trino:trino
-CMD java -jar /usr/lib/trino-gateway/gateway-ha-jar-with-dependencies.jar "/etc/trino-gateway/config.yaml"
+CMD ["/usr/lib/trino-gateway/bin/run-trino-gateway"]
 
 HEALTHCHECK --interval=10s --timeout=5s --start-period=10s \
   CMD /usr/lib/trino-gateway/bin/health-check

docker/bin/run-trino-gateway

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -xeuo pipefail
+
+launcher_opts=(--etc-dir /etc/trino-gateway --config /etc/trino-gateway/config.yaml)
+if ! grep -s -q 'node.id' /etc/trino-gateway/node.properties; then
+    launcher_opts+=("-Dnode.id=${HOSTNAME}")
+fi
+
+exec /usr/lib/trino-gateway/bin/launcher run "${launcher_opts[@]}" "$@"

docker/build.sh

@@ -85,23 +85,23 @@ check_environment
 
 if [ -n "$TRINO_GATEWAY_VERSION" ]; then
     echo "🎣 Downloading Trino Gateway server artifact for release version ${TRINO_GATEWAY_VERSION}"
-    "${SOURCE_DIR}/mvnw" -C dependency:get -Dtransitive=false -Dartifact="io.trino.gateway:gateway-ha:${TRINO_GATEWAY_VERSION}:jar:jar-with-dependencies"
+    "${SOURCE_DIR}/mvnw" -C dependency:get -Dtransitive=false -Dartifact="io.trino.gateway:trino-gateway-server:${TRINO_GATEWAY_VERSION}:tar.gz"
     local_repo=$("${SOURCE_DIR}/mvnw" -B help:evaluate -Dexpression=settings.localRepository -q -DforceStdout)
-    trino_gateway_ha="$local_repo/io/trino/gateway/gateway-ha/${TRINO_GATEWAY_VERSION}/gateway-ha-${TRINO_GATEWAY_VERSION}-jar-with-dependencies.jar"
+    trino_gateway_ha="$local_repo/io/trino/gateway/trino-gateway-server/${TRINO_GATEWAY_VERSION}/trino-gateway-server-${TRINO_GATEWAY_VERSION}.tar.gz"
     chmod +x "$trino_gateway_ha"
 else
     TRINO_GATEWAY_VERSION=$("${SOURCE_DIR}/mvnw" -f "${SOURCE_DIR}/pom.xml" --quiet help:evaluate -Dexpression=project.version -DforceStdout)
-    echo "🎯 Using currently built artifacts from the gateway-ha module with version ${TRINO_GATEWAY_VERSION}"
-    trino_gateway_ha="${SOURCE_DIR}/gateway-ha/target/gateway-ha-${TRINO_GATEWAY_VERSION}-jar-with-dependencies.jar"
+    echo "🎯 Using currently built artifacts with version ${TRINO_GATEWAY_VERSION}"
+    trino_gateway_ha="${SOURCE_DIR}/trino-gateway-server/target/trino-gateway-server-${TRINO_GATEWAY_VERSION}.tar.gz"
 fi
 
 echo "🧱 Preparing the image build context directory"
 WORK_DIR="$(mktemp -d)"
-GATEWAY_WORK_DIR="${WORK_DIR}/gateway-ha"
-mkdir "${GATEWAY_WORK_DIR}"
-cp "$trino_gateway_ha" "${GATEWAY_WORK_DIR}/gateway-ha-jar-with-dependencies.jar"
-cp -R bin "${GATEWAY_WORK_DIR}"
-cp "${SCRIPT_DIR}/Dockerfile" "${WORK_DIR}"
+cp "$trino_gateway_ha" "${WORK_DIR}/"
+tar -C "${WORK_DIR}" -xzf "${WORK_DIR}/trino-gateway-server-${TRINO_GATEWAY_VERSION}.tar.gz"
+rm "${WORK_DIR}/trino-gateway-server-${TRINO_GATEWAY_VERSION}.tar.gz"
+cp -R bin "${WORK_DIR}/trino-gateway-server-${TRINO_GATEWAY_VERSION}"
+cp -R default "${WORK_DIR}/"
 
 TAG_PREFIX="trino-gateway:${TRINO_GATEWAY_VERSION}"
 #version file is used by the Helm chart test
@@ -122,7 +122,8 @@ for arch in "${ARCHITECTURES[@]}"; do
         --build-arg TRINO_GATEWAY_BUILD_IMAGE="${TRINO_GATEWAY_BUILD_IMAGE}" \
         --platform "linux/$arch" \
         -f Dockerfile \
-        -t "${TAG_PREFIX}-$arch"
+        -t "${TAG_PREFIX}-$arch" \
+        --build-arg "TRINO_GATEWAY_VERSION=${TRINO_GATEWAY_VERSION}"
 done
 
 echo "🧹 Cleaning up the build context directory"

docker/config.yaml docker/default/etc/config.yamldocker/config.yaml renamed to docker/default/etc/config.yaml

@@ -0,0 +1,16 @@
+-server
+-XX:InitialRAMPercentage=80
+-XX:MaxRAMPercentage=80
+-XX:G1HeapRegionSize=32M
+-XX:+ExplicitGCInvokesConcurrent
+-XX:+HeapDumpOnOutOfMemoryError
+-XX:+ExitOnOutOfMemoryError
+-XX:-OmitStackTraceInFastThrow
+-XX:ReservedCodeCacheSize=256M
+-XX:PerMethodRecompilationCutoff=10000
+-XX:PerBytecodeRecompilationCutoff=10000
+-Djdk.attach.allowAttachSelf=true
+-Djdk.nio.maxCachedBufferSize=2000000
+-Dfile.encoding=UTF-8
+# Allow loading dynamic agent used by JOL
+-XX:+EnableDynamicAgentLoading

docker/default/etc/jvm.config

@@ -0,0 +1,2 @@
+# Enable verbose logging from Trino
+#io.trino=DEBUG

docker/default/etc/log.properties

@@ -0,0 +1,2 @@
+node.environment=docker
+node.data-dir=/data/trino-gateway

docker/default/etc/node.properties

@@ -12,10 +12,6 @@ services:
       start_period: 20s
     ports:
       - "8080:8080"
-    volumes:
-      - target: /etc/trino-gateway/config.yaml
-        source: ./config.yaml
-        type: bind
 
   postgres:
     image: ${TRINO_GATEWAY_POSTGRES_IMAGE:-postgres:17-alpine}

docker/docker-compose.yml

@@ -35,8 +35,8 @@ To enable them, set the environment variable `TG_RUN_ORACLE_TESTS=true`. These t
 will always be run in GitHub CI.
 
 ```shell
-cd gateway-ha/target/
-java -jar gateway-ha-{{VERSION}}-jar-with-dependencies.jar ../config.yaml
+cd trino-gateway-server/target/trino-gateway-server-{{VERSION}}
+bin/launcher start --config path/to/config.yaml
 ```
 
 #### In Docker

docs/development.md

@@ -151,8 +151,7 @@ details found in the `docker-compose.yml` file.
 
 ## Configuration
 
-The image uses the configuration file `docker/config.yaml` from the project
-checkout, and mounts it at `/etc/trino-gateway/config.yaml`.
+The image uses the configuration file `docker/default/etc/config.yaml` from the project checkout.
 
 ## Health check