Create single entry point for system verification

trinodb · May 27, 2024 · d52b459 · d52b459
1 parent 81a8bcf
commit d52b459
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/server/Server.java b/core/trino-main/src/main/java/io/trino/server/Server.java
@@ -80,8 +80,7 @@
 import static com.google.common.collect.MoreCollectors.toOptional;
 import static io.airlift.discovery.client.ServiceAnnouncement.ServiceAnnouncementBuilder;
 import static io.airlift.discovery.client.ServiceAnnouncement.serviceAnnouncement;
-import static io.trino.server.TrinoSystemRequirements.verifyJvmRequirements;
-import static io.trino.server.TrinoSystemRequirements.verifySystemTimeIsReasonable;
+import static io.trino.server.TrinoSystemRequirements.verifySystemRequirements;
 import static java.lang.String.format;
 import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
 import static java.util.function.Predicate.not;
@@ -101,8 +100,7 @@ private void doStart(String trinoVersion)
         Locale.setDefault(Locale.US);
 
         long startTime = System.nanoTime();
-        verifyJvmRequirements();
-        verifySystemTimeIsReasonable();
+        verifySystemRequirements();
 
         Logger log = Logger.get(Server.class);
         log.info("Java version: %s", StandardSystemProperty.JAVA_VERSION.value());

diff --git a/core/trino-main/src/main/java/io/trino/server/TrinoSystemRequirements.java b/core/trino-main/src/main/java/io/trino/server/TrinoSystemRequirements.java
@@ -47,7 +47,13 @@ final class TrinoSystemRequirements
 
     private TrinoSystemRequirements() {}
 
-    public static void verifyJvmRequirements()
+    public static void verifySystemRequirements()
+    {
+        verifyJvmRequirements();
+        verifySystemTimeIsReasonable();
+    }
+
+    private static void verifyJvmRequirements()
     {
         verifyJavaVersion();
         verify64BitJvm();
@@ -183,7 +189,7 @@ private static void verifyUtf8()
      * Perform a sanity check to make sure that the year is reasonably current, to guard against
      * issues in third party libraries.
      */
-    public static void verifySystemTimeIsReasonable()
+    private static void verifySystemTimeIsReasonable()
     {
         int currentYear = DateTime.now().year().get();
         if (currentYear < 2024) {

diff --git a/core/trino-main/src/test/java/io/trino/server/TestTrinoSystemRequirements.java b/core/trino-main/src/test/java/io/trino/server/TestTrinoSystemRequirements.java
@@ -15,20 +15,13 @@
 
 import org.junit.jupiter.api.Test;
 
-import static io.trino.server.TrinoSystemRequirements.verifyJvmRequirements;
-import static io.trino.server.TrinoSystemRequirements.verifySystemTimeIsReasonable;
+import static io.trino.server.TrinoSystemRequirements.verifySystemRequirements;
 
 public class TestTrinoSystemRequirements
 {
     @Test
-    public void testVerifyJvmRequirements()
+    public void testVerifySystemRequirements()
     {
-        verifyJvmRequirements();
-    }
-
-    @Test
-    public void testSystemTimeSanityCheck()
-    {
-        verifySystemTimeIsReasonable();
+        verifySystemRequirements();
     }
 }