Add launcher and create tar for trino-gateway

anilsomisetty · anilsomisetty · commit ece7f3747f59 · 2025-05-22T23:32:12.000+05:30
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -47,7 +47,7 @@ COPY --chown=trino:trino gateway-ha /usr/lib/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 /bin/sh -c "/usr/lib/trino-gateway/gateway-server/bin/launcher start --config /etc/trino-gateway/config.yaml && sleep 10"
 
 HEALTHCHECK --interval=10s --timeout=5s --start-period=10s \
   CMD /usr/lib/trino-gateway/bin/health-check
diff --git a/docker/build.sh b/docker/build.sh
@@ -102,15 +102,20 @@ if [ -n "$TRINO_GATEWAY_VERSION" ]; then
     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}/gateway-server/target/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"
+GATEWAY_SERVER_DIR="${WORK_DIR}/gateway-ha/gateway-server"
+mkdir -p "${GATEWAY_SERVER_DIR}/etc"
+mkdir -p "${GATEWAY_SERVER_DIR}/data"
+touch "${GATEWAY_SERVER_DIR}/etc/jvm.config"
+echo "node.data-dir=/usr/lib/trino-gateway/gateway-server/data/" > "${GATEWAY_SERVER_DIR}/etc/node.properties"
+tar -zx --strip 1 -C "${GATEWAY_SERVER_DIR}" -f "${trino_gateway_ha}"
+#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}"
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -6,10 +6,10 @@ services:
         condition: service_healthy
     healthcheck:
       test: ["CMD-SHELL", "/usr/lib/trino-gateway/bin/health-check || exit 1"]
-      interval: 5s
-      timeout: 5s
+      interval: 30s
+      timeout: 30s
       retries: 60
-      start_period: 20s
+      start_period: 60s
     ports:
       - "8080:8080"
     volumes:
diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/HaGatewayLauncher.java b/gateway-ha/src/main/java/io/trino/gateway/ha/HaGatewayLauncher.java
@@ -109,10 +109,11 @@ public static void main(String[] args)
             throws Exception
     {
         ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Expected exactly one argument (path of configuration file)");
+        String configFile = System.getProperty("config");
+        if (configFile == null) {
+            throw new IllegalArgumentException("Configuration file not specified. Use -Dconfig=<config-file>");
         }
-        String config = Files.readString(Path.of(args[0]));
+        String config = Files.readString(Path.of(configFile));
         HaGatewayConfiguration haGatewayConfiguration = objectMapper.readValue(replaceEnvironmentVariables(config), HaGatewayConfiguration.class);
         FlywayMigration.migrate(haGatewayConfiguration.getDataStore());
         List<Module> modules = addModules(haGatewayConfiguration);
diff --git a/gateway-ha/src/test/java/io/trino/gateway/TrinoGatewayRunner.java b/gateway-ha/src/test/java/io/trino/gateway/TrinoGatewayRunner.java
@@ -60,7 +60,8 @@ public static void main(String[] args)
         mysql.withCopyFileToContainer(forClasspathResource("add_backends_mysql.sql"), "/docker-entrypoint-initdb.d/2-add_backends_mysql.sql");
         mysql.setPortBindings(List.of("3306:3306"));
         mysql.start();
-        HaGatewayLauncher.main(new String[] {"gateway-ha/config.yaml"});
+        System.setProperty("config", "gateway-ha/config.yaml");
+        HaGatewayLauncher.main(new String[] {});
 
         log.info("======== SERVER STARTED ========");
     }
diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaMultipleBackend.java b/gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaMultipleBackend.java
@@ -120,8 +120,8 @@ public MockResponse dispatch(RecordedRequest request)
                 HaGatewayTestUtils.buildGatewayConfig(postgresql, routerPort, "test-config-template.yml");
 
         // Start Gateway
-        String[] args = {testConfigFile.getAbsolutePath()};
-        HaGatewayLauncher.main(args);
+        System.setProperty("config", testConfigFile.getAbsolutePath());
+        HaGatewayLauncher.main(new String[] {});
         // Now populate the backend
         HaGatewayTestUtils.setUpBackend(
                 "trino1", "http://localhost:" + backend1Port, "externalUrl", true, "adhoc", routerPort);
diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaSingleBackend.java b/gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaSingleBackend.java
@@ -58,8 +58,8 @@ void setup()
         File testConfigFile =
                 HaGatewayTestUtils.buildGatewayConfig(postgresql, routerPort, "test-config-template.yml");
         // Start Gateway
-        String[] args = {testConfigFile.getAbsolutePath()};
-        HaGatewayLauncher.main(args);
+        System.setProperty("config", testConfigFile.getAbsolutePath());
+        HaGatewayLauncher.main(new String[] {});
         // Now populate the backend
         HaGatewayTestUtils.setUpBackend(
                 "trino1", "http://localhost:" + backendPort, "externalUrl", true, "adhoc", routerPort);
diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaWithRoutingRulesSingleBackend.java b/gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaWithRoutingRulesSingleBackend.java
@@ -55,8 +55,8 @@ void setup()
         File testConfigFile =
                 HaGatewayTestUtils.buildGatewayConfig(postgresql, routerPort, "test-config-with-routing-template.yml");
         // Start Gateway
-        String[] args = {testConfigFile.getAbsolutePath()};
-        HaGatewayLauncher.main(args);
+        System.setProperty("config", testConfigFile.getAbsolutePath());
+        HaGatewayLauncher.main(new String[] {});
         // Now populate the backend
         HaGatewayTestUtils.setUpBackend(
                 "trino1", "http://localhost:" + backendPort, "externalUrl", true, "system", routerPort);
diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/TestNoXForwarded.java b/gateway-ha/src/test/java/io/trino/gateway/ha/TestNoXForwarded.java
@@ -57,8 +57,8 @@ void setup()
         File testConfigFile =
                 HaGatewayTestUtils.buildGatewayConfig(postgresql, routerPort, "test-config-without-x-forwarded-template.yml");
         // Start Gateway
-        String[] args = {testConfigFile.getAbsolutePath()};
-        HaGatewayLauncher.main(args);
+        System.setProperty("config", testConfigFile.getAbsolutePath());
+        HaGatewayLauncher.main(new String[] {});
         // Now populate the backend
         HaGatewayTestUtils.setUpBackend(
                 "trino1", "http://localhost:" + backendPort, "externalUrl", true, "adhoc", routerPort);
diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/TestTrinoResource.java b/gateway-ha/src/test/java/io/trino/gateway/ha/TestTrinoResource.java
@@ -70,8 +70,8 @@ void setup()
         resourceGroupManager = new HaResourceGroupsManager(connectionManager);
 
         // Start Trino Gateway so migrations are run to create tables before inserting test data
-        String[] args = {testConfigFile.getAbsolutePath()};
-        HaGatewayLauncher.main(args);
+        System.setProperty("config", testConfigFile.getAbsolutePath());
+        HaGatewayLauncher.main(new String[] {});
 
         prepareData();
     }
diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingAPI.java b/gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingAPI.java
@@ -63,8 +63,8 @@ void setup()
         File testConfigFile =
                 HaGatewayTestUtils.buildGatewayConfig(postgresql, routerPort, "test-config-with-routing-rules-api.yml");
         // Start Gateway
-        String[] args = {testConfigFile.getAbsolutePath()};
-        HaGatewayLauncher.main(args);
+        System.setProperty("config", testConfigFile.getAbsolutePath());
+        HaGatewayLauncher.main(new String[] {});
         // Now populate the backend
         HaGatewayTestUtils.setUpBackend(
                 "trino1", "http://localhost:" + backendPort, "externalUrl", true, "adhoc", routerPort);
diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestAuthorization.java b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestAuthorization.java
@@ -55,8 +55,8 @@ void setup()
     {
         postgresql.start();
         File testConfigFile = HaGatewayTestUtils.buildGatewayConfig(postgresql, routerPort, "auth/auth-test-config.yml");
-        String[] args = {testConfigFile.getAbsolutePath()};
-        HaGatewayLauncher.main(args);
+        System.setProperty("config", testConfigFile.getAbsolutePath());
+        HaGatewayLauncher.main(new String[] {});
     }
 
     @Test
diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestOIDC.java b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestOIDC.java
@@ -146,9 +146,9 @@ void setup()
 
         File testConfigFile =
                 HaGatewayTestUtils.buildGatewayConfig(gatewayBackendDatabase, ROUTER_PORT, "auth/oauth-test-config.yml");
-        String[] args = {testConfigFile.getAbsolutePath()};
         System.out.println(ROUTER_PORT);
-        HaGatewayLauncher.main(args);
+        System.setProperty("config", testConfigFile.getAbsolutePath());
+        HaGatewayLauncher.main(new String[] {});
     }
 
     @Test
diff --git a/gateway-ha/src/test/java/io/trino/gateway/proxyserver/TestProxyRequestHandler.java b/gateway-ha/src/test/java/io/trino/gateway/proxyserver/TestProxyRequestHandler.java
@@ -85,8 +85,8 @@ public MockResponse dispatch(RecordedRequest request)
 
         File testConfigFile = buildGatewayConfig(postgresql, routerPort, "test-config-template.yml");
 
-        String[] args = {testConfigFile.getAbsolutePath()};
-        HaGatewayLauncher.main(args);
+        System.setProperty("config", testConfigFile.getAbsolutePath());
+        HaGatewayLauncher.main(new String[] {});
 
         setUpBackend("custom", "http://localhost:" + customBackendPort, "externalUrl", true, "adhoc", routerPort);
     }
diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.trino.gateway</groupId>
+        <artifactId>trino-gateway-parent</artifactId>
+        <version>16-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>gateway-server</artifactId>
+    <packaging>provisio</packaging>
+    <description>Trino Gateway - Server package</description>
+
+    <properties>
+        <dep.takari.version>2.1.4</dep.takari.version>
+        <server.tar.package>gateway-server-${project.version}</server.tar.package>
+
+        <!-- Launcher properties -->
+        <main-class>io.trino.gateway.ha.HaGatewayLauncher</main-class>
+        <process-name>${project.artifactId}</process-name>
+
+        <!-- Special consideration for Takari Lifecycle -->
+        <!-- This works as trino-server have no sources (is just provisio packaged) -->
+        <takari.skip>false</takari.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>ca.vanzyl.provisio.maven.plugins</groupId>
+                <artifactId>provisio-maven-plugin</artifactId>
+                <version>1.0.24</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>pack</id>
+                        <goals>
+                            <goal>provision</goal>
+                        </goals>
+                        <configuration>
+                            <descriptorDirectory>${project.basedir}/src/main/provisio</descriptorDirectory>
+                            <outputDirectory>${project.build.directory}/${server.tar.package}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>io.takari.maven.plugins</groupId>
+                <artifactId>takari-lifecycle-plugin</artifactId>
+                <version>${dep.takari.version}</version>
+                <configuration>
+                    <proc>none</proc>
+                    <skip>${takari.skip}</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <configuration>
+                    <ignoredResourcePatterns combine.children="append">
+                        <ignoredResourcePattern>aircompressor.*</ignoredResourcePattern>
+                    </ignoredResourcePatterns>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/gateway-server/src/main/provisio/trino-gateway.xml b/gateway-server/src/main/provisio/trino-gateway.xml
@@ -0,0 +1,20 @@
+<runtime>
+    <!-- Target -->
+    <archive name="${project.artifactId}-${project.version}.tar.gz" hardLinkIncludes="**/*.jar" />
+
+    <!-- Launcher -->
+    <artifactSet to="bin">
+        <artifact id="io.airlift:launcher:tar.gz:bin:${dep.airlift.launcher.version}">
+            <unpack />
+        </artifact>
+        <artifact id="io.airlift:launcher:tar.gz:properties:${dep.airlift.launcher.version}">
+            <unpack filter="true" />
+        </artifact>
+    </artifactSet>
+
+    <!-- Gateway Server -->
+    <artifactSet to="lib">
+        <artifact id="${project.groupId}:gateway-ha:${project.version}" />
+    </artifactSet>
+
+</runtime>
diff --git a/gateway-server/src/test/java/io/trino/gateway/server/TestDummy.java b/gateway-server/src/test/java/io/trino/gateway/server/TestDummy.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.gateway.server;
+
+import org.junit.jupiter.api.Test;
+
+public class TestDummy
+{
+    @Test
+    public void buildRequiresTestToExist() {}
+}
diff --git a/pom.xml b/pom.xml
@@ -29,6 +29,7 @@
 
     <modules>
         <module>gateway-ha</module>
+        <module>gateway-server</module>
     </modules>
     <scm>
         <connection>scm:git:git://github.com/trinodb/trino-gateway.git</connection>
@@ -44,6 +45,7 @@
         <air.check.skip-spotbugs>true</air.check.skip-spotbugs>
         <air.check.skip-pmd>true</air.check.skip-pmd>
         <air.release.preparation-goals>clean verify -DskipTests</air.release.preparation-goals>
+        <dep.airlift.launcher.version>303</dep.airlift.launcher.version>
     </properties>
 
     <dependencyManagement>

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ public static void main(String[] args)`
`60`	`60`	`mysql.withCopyFileToContainer(forClasspathResource("add_backends_mysql.sql"), "/docker-entrypoint-initdb.d/2-add_backends_mysql.sql");`
`61`	`61`	`mysql.setPortBindings(List.of("3306:3306"));`
`62`	`62`	`mysql.start();`
`63`		`- HaGatewayLauncher.main(new String[] {"gateway-ha/config.yaml"});`
	`63`	`+ System.setProperty("config", "gateway-ha/config.yaml");`
	`64`	`+ HaGatewayLauncher.main(new String[] {});`
`64`	`65`
`65`	`66`	`log.info("======== SERVER STARTED ========");`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ void setup()`
`70`	`70`	`resourceGroupManager = new HaResourceGroupsManager(connectionManager);`
`71`	`71`
`72`	`72`	`// Start Trino Gateway so migrations are run to create tables before inserting test data`
`73`		`- String[] args = {testConfigFile.getAbsolutePath()};`
`74`		`- HaGatewayLauncher.main(args);`
	`73`	`+ System.setProperty("config", testConfigFile.getAbsolutePath());`
	`74`	`+ HaGatewayLauncher.main(new String[] {});`
`75`	`75`
`76`	`76`	`prepareData();`
`77`	`77`	`}`