Skip to content

JDK 22 preparations #21190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 21, 2024
Merged

JDK 22 preparations #21190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c6ab63
Add Temurin 22 JDK provider
wendigo Mar 20, 2024
2c45457
Test RPM on ubi9 image with downloaded Temurin JDK
wendigo Mar 21, 2024
ac2741a
Switch to JDK 22 GA in testing
wendigo Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
matrix:
include:
- { java-version: 21, cache: 'true', cleanup-node: 'false' }
- { java-version: 22-ea, cache: 'restore', cleanup-node: 'true' }
- { java-version: 22, cache: 'restore', cleanup-node: 'true' }
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -121,8 +121,8 @@ jobs:
platforms: arm64,ppc64le
- name: Build and Test Docker Image
run: core/docker/build.sh
- name: Build and Test AMD64 Docker Image with JDK 22-ea
run: core/docker/build.sh -j 22-ea -a amd64
- name: Build and Test AMD64 Docker Image with JDK 22
run: core/docker/build.sh -j 22 -a amd64

check-commits-dispatcher:
runs-on: ubuntu-latest
Expand Down
6 changes: 6 additions & 0 deletions core/trino-server-rpm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.trino</groupId>
<artifactId>trino-testing-containers</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.trino</groupId>
<artifactId>trino-testing-services</artifactId>
Expand Down
145 changes: 80 additions & 65 deletions core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import io.trino.testing.containers.TestContainers.DockerArchitecture;
import org.assertj.core.api.AbstractAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Execution;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.Container.ExecResult;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.utility.DockerImageName;

import java.io.File;
import java.io.IOException;
Expand All @@ -43,6 +45,7 @@
import static io.trino.server.rpm.ServerIT.PathInfoAssert.assertThatPaths;
import static io.trino.testing.TestingProperties.getProjectVersion;
import static io.trino.testing.assertions.Assert.assertEventually;
import static io.trino.testing.containers.TestContainers.getDockerArchitectureInfo;
import static java.lang.String.format;
import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
import static java.sql.DriverManager.getConnection;
Expand All @@ -56,8 +59,8 @@
@Execution(SAME_THREAD)
public class ServerIT
{
private static final String BASE_IMAGE_PREFIX = "eclipse-temurin:";
private static final String BASE_IMAGE_SUFFIX = "-jre-ubi9-minimal";
private static final DockerImageName BASE_IMAGE = DockerImageName.parse("registry.access.redhat.com/ubi9/ubi-minimal:latest");
private static final DockerArchitecture ARCH = getDockerArchitectureInfo(BASE_IMAGE).imageArch();

private final String rpmHostPath;

Expand All @@ -67,38 +70,37 @@ public ServerIT()
}

@Test
public void testInstall()
public void testInstallUninstall()
throws Exception
{
testInstall("21");
// Release names as in the https://api.adoptium.net/q/swagger-ui/#/Release%20Info/getReleaseNames
testInstall("jdk-21.0.2+13", "/usr/lib/jvm/temurin-21", "21");
testUninstall("jdk-21.0.2+13", "/usr/lib/jvm/temurin-21", "21");
}

private void testInstall(String javaVersion)
private void testInstall(String temurinReleaseName, String javaHome, String expectedJavaVersion)
{
String rpm = "/" + new File(rpmHostPath).getName();
String command = "" +
// install required dependencies that are missing in UBI9-minimal
"microdnf install -y python sudo shadow-utils\n" +
// install RPM
"rpm -i " + rpm + "\n" +
// create Hive catalog file
"mkdir /etc/trino/catalog\n" +
"echo CONFIG_ENV[HMS_PORT]=9083 >> /etc/trino/env.sh\n" +
"echo CONFIG_ENV[NODE_ID]=test-node-id-injected-via-env >> /etc/trino/env.sh\n" +
"sed -i \"s/^node.id=.*/node.id=\\${ENV:NODE_ID}/g\" /etc/trino/node.properties\n" +
"cat > /etc/trino/catalog/hive.properties <<\"EOT\"\n" +
"connector.name=hive\n" +
"hive.metastore.uri=thrift://localhost:${ENV:HMS_PORT}\n" +
"EOT\n" +
// create JMX catalog file
"cat > /etc/trino/catalog/jmx.properties <<\"EOT\"\n" +
"connector.name=jmx\n" +
"EOT\n" +
// start server
"/etc/init.d/trino start\n" +
// allow tail to work with Docker's non-local file system
"tail ---disable-inotify -F /var/log/trino/server.log\n";

try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE_PREFIX + javaVersion + BASE_IMAGE_SUFFIX)) {
String command = """
microdnf install -y tar gzip python sudo shadow-utils
%s
rpm -i %s
mkdir /etc/trino/catalog
echo CONFIG_ENV[HMS_PORT]=9083 >> /etc/trino/env.sh
echo CONFIG_ENV[NODE_ID]=test-node-id-injected-via-env >> /etc/trino/env.sh
sed -i "s/^node.id=.*/node.id=\\${ENV:NODE_ID}/g" /etc/trino/node.properties
cat > /etc/trino/catalog/hive.properties <<"EOT"
connector.name=hive
hive.metastore.uri=thrift://localhost:${ENV:HMS_PORT}
EOT
cat > /etc/trino/catalog/jmx.properties <<"EOT"
connector.name=jmx
EOT
/etc/init.d/trino start
tail ---disable-inotify -F /var/log/trino/server.log
""".formatted(installJavaCommand(temurinReleaseName, javaHome), rpm);

try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE)) {
container.withExposedPorts(8080)
// the RPM is hundreds MB and file system bind is much more efficient
.withFileSystemBind(rpmHostPath, rpm, BindMode.READ_ONLY)
Expand All @@ -111,7 +113,41 @@ private void testInstall(String javaVersion)
// TODO remove usage of assertEventually once https://github.com/trinodb/trino/issues/2214 is fixed
assertEventually(
new io.airlift.units.Duration(1, MINUTES),
() -> assertThat(queryRunner.execute("SELECT specversion FROM jmx.current.\"java.lang:type=runtime\"")).isEqualTo(ImmutableSet.of(asList(javaVersion))));
() -> assertThat(queryRunner.execute("SELECT specversion FROM jmx.current.\"java.lang:type=runtime\"")).isEqualTo(ImmutableSet.of(asList(expectedJavaVersion))));
}
}


private void testUninstall(String temurinReleaseName, String javaHome, String expectedJavaVersion)
throws Exception
{
String rpm = "/" + new File(rpmHostPath).getName();
String installAndStartTrino = """
microdnf install -y tar gzip python sudo shadow-utils
%s
rpm -i %s
/etc/init.d/trino start
tail ---disable-inotify -F /var/log/trino/server.log
""".formatted(installJavaCommand(temurinReleaseName, javaHome), rpm);

try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE)) {
container.withFileSystemBind(rpmHostPath, rpm, BindMode.READ_ONLY)
.withCommand("sh", "-xeuc", installAndStartTrino)
.waitingFor(forLogMessage(".*SERVER STARTED.*", 1).withStartupTimeout(Duration.ofMinutes(5)))
.start();
String uninstallTrino = """
/etc/init.d/trino stop
rpm -e trino-server-rpm
""";
container.execInContainer("sh", "-xeuc", uninstallTrino);

ExecResult actual = container.execInContainer("rpm", "-q", "trino-server-rpm");
assertThat(actual.getStdout()).isEqualTo("package trino-server-rpm is not installed\n");

assertPathDeleted(container, "/var/lib/trino");
assertPathDeleted(container, "/usr/lib/trino");
assertPathDeleted(container, "/etc/init.d/trino");
assertPathDeleted(container, "/usr/shared/doc/trino");
}
}

Expand All @@ -120,7 +156,7 @@ public void testRpmContents()
throws IOException, InterruptedException
{
String rpm = "/" + new File(rpmHostPath).getName();
try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE_PREFIX + "21" + BASE_IMAGE_SUFFIX)) {
try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE)) {
container
.withFileSystemBind(rpmHostPath, rpm, BindMode.READ_ONLY)
.withCommand("sleep 1h")
Expand Down Expand Up @@ -163,7 +199,7 @@ public void testRpmMetadata()
throws IOException, InterruptedException
{
String rpm = "/" + new File(rpmHostPath).getName();
try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE_PREFIX + "21" + BASE_IMAGE_SUFFIX)) {
try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE)) {
container
.withFileSystemBind(rpmHostPath, rpm, BindMode.READ_ONLY)
.withCommand("sleep 1h")
Expand All @@ -181,43 +217,22 @@ public void testRpmMetadata()
}
}

@Test
public void testUninstall()
throws Exception
private static String temurinDownloadLink(String temurinReleaseName)
{
testUninstall("21");
return switch (ARCH) {
case AMD64 -> "https://api.adoptium.net/v3/binary/version/%s/linux/x64/jdk/hotspot/normal/eclipse?project=jdk".formatted(temurinReleaseName);
case ARM64 -> "https://api.adoptium.net/v3/binary/version/%s/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk".formatted(temurinReleaseName);
default -> throw new UnsupportedOperationException("Unsupported arch: " + ARCH);
};
}

private void testUninstall(String javaVersion)
throws Exception
private static String installJavaCommand(String temurinReleaseName, String javaHome)
{
String rpm = "/" + new File(rpmHostPath).getName();
String installAndStartTrino = "" +
// install required dependencies that are missing in UBI9-minimal
"microdnf install -y python sudo shadow-utils\n" +
// install RPM
"rpm -i " + rpm + "\n" +
"/etc/init.d/trino start\n" +
// allow tail to work with Docker's non-local file system
"tail ---disable-inotify -F /var/log/trino/server.log\n";
try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE_PREFIX + javaVersion + BASE_IMAGE_SUFFIX)) {
container.withFileSystemBind(rpmHostPath, rpm, BindMode.READ_ONLY)
.withCommand("sh", "-xeuc", installAndStartTrino)
.waitingFor(forLogMessage(".*SERVER STARTED.*", 1).withStartupTimeout(Duration.ofMinutes(5)))
.start();
String uninstallTrino = "" +
"/etc/init.d/trino stop\n" +
"rpm -e trino-server-rpm\n";
container.execInContainer("sh", "-xeuc", uninstallTrino);

ExecResult actual = container.execInContainer("rpm", "-q", "trino-server-rpm");
assertThat(actual.getStdout()).isEqualTo("package trino-server-rpm is not installed\n");

assertPathDeleted(container, "/var/lib/trino");
assertPathDeleted(container, "/usr/lib/trino");
assertPathDeleted(container, "/etc/init.d/trino");
assertPathDeleted(container, "/usr/shared/doc/trino");
}
return """
echo "Downloading JDK from %1$s"
mkdir -p "%2$s"
curl -#LfS "%1$s" | tar -zx --strip 1 -C "%2$s"
""".formatted(temurinDownloadLink(temurinReleaseName), javaHome);
}

private static void assertPathDeleted(GenericContainer<?> container, String path)
Expand Down
33 changes: 33 additions & 0 deletions ...-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin22JdkProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* 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.tests.product.launcher.env.jdk;

import com.google.inject.Inject;
import io.trino.tests.product.launcher.env.EnvironmentOptions;

public class Temurin22JdkProvider
extends AdoptiumApiResolvingJdkProvider
{
@Inject
public Temurin22JdkProvider(EnvironmentOptions environmentOptions)
{
super(environmentOptions);
}

@Override
protected String getReleaseName()
{
return "jdk-22+36";
}
}