Skip to content

feat(runtime): enforce Java 17 for ARM64 #6459

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 1 commit into from
Sep 29, 2025
Merged

feat(runtime): enforce Java 17 for ARM64 #6459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 41 additions & 10 deletions framework/src/test/java/org/tron/core/exception/TronErrorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;

import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
Expand Down Expand Up @@ -127,25 +130,53 @@ public void shutdownBlockTimeInitTest() {

@Test
public void testThrowIfUnsupportedJavaVersion() {
runArchTest(true, false, true);
runArchTest(true, true, false);
runArchTest(false, false, false);
runArchTest("x86_64", "1.8", false);
runArchTest("x86_64", "11", true);
runArchTest("x86_64", "17", true);
runArchTest("aarch64", "17", false);
runArchTest("aarch64", "1.8", true);
runArchTest("aarch64", "11", true);
}

private void runArchTest(boolean isX86, boolean isJava8, boolean expectThrow) {
private void runArchTest(String osArch, String javaVersion, boolean expectThrow) {
try (MockedStatic<Arch> mocked = mockStatic(Arch.class)) {
boolean isX86 = "x86_64".equals(osArch);
boolean isArm64 = "aarch64".equals(osArch);

boolean isJava8 = "1.8".equals(javaVersion);
boolean isJava17 = "17".equals(javaVersion);

mocked.when(Arch::isX86).thenReturn(isX86);
mocked.when(Arch::isArm64).thenReturn(isArm64);

mocked.when(Arch::isJava8).thenReturn(isJava8);
mocked.when(Arch::getOsArch).thenReturn("x86_64");
mocked.when(Arch::javaSpecificationVersion).thenReturn("17");
mocked.when(Arch::withAll).thenReturn("");
mocked.when(Arch::isJava17).thenReturn(isJava17);

mocked.when(Arch::getOsArch).thenReturn(osArch);
mocked.when(Arch::javaSpecificationVersion).thenReturn(javaVersion);
mocked.when(Arch::withAll).thenReturn(String.format(
"Architecture: %s, Java Version: %s", osArch, javaVersion));

mocked.when(Arch::throwIfUnsupportedJavaVersion).thenCallRealMethod();

if (expectThrow) {
assertEquals(TronError.ErrCode.JDK_VERSION, assertThrows(
TronError.class, () -> Args.setParam(new String[]{}, Constant.TEST_CONF)).getErrCode());
TronError err = assertThrows(
TronError.class, () -> Args.setParam(new String[]{}, Constant.TEST_CONF));

String expectedJavaVersion = isX86 ? "1.8" : "17";
String expectedMessage = String.format(
"Java %s is required for %s architecture. Detected version %s",
expectedJavaVersion, osArch, javaVersion);
assertEquals(expectedMessage, err.getCause().getMessage());
assertEquals(TronError.ErrCode.JDK_VERSION, err.getErrCode());
mocked.verify(Arch::withAll, times(1));
} else {
Arch.throwIfUnsupportedJavaVersion();
try {
Arch.throwIfUnsupportedJavaVersion();
} catch (Exception e) {
fail("Expected no exception, but got: " + e.getMessage());
}
mocked.verify(Arch::withAll, never());
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions platform/src/main/java/common/org/tron/common/arch/Arch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,15 @@ public static boolean isJava8() {
return javaSpecificationVersion().equals("1.8");
}

public static boolean isJava17() {
return javaSpecificationVersion().equals("17");
}

public static void throwIfUnsupportedJavaVersion() {
if (isX86() && !isJava8()) {
if ((isX86() && !isJava8()) || (isArm64() && !isJava17())) {
logger.info(withAll());
throw new UnsupportedOperationException(String.format(
"Java %s is required for %s architecture. Detected version %s", "1.8",
"Java %s is required for %s architecture. Detected version %s", isX86() ? "1.8" : "17",
getOsArch(), javaSpecificationVersion()));
}
}
Expand Down