Remove legacy versioned logic for DefaultSystemMemoryInfo (#85761)

The machine dependent heap logic uses SystemMemoryInfo to determine how
much total memory is available on the system. The default implementation
delegates to Java's MX bean to get OS stats. In the past this was only
available in Java 14, but since the main branch is now on Java 17, we do
not need this logic.

This commit refactors the default implementation to no longer need the
version check, and to also remove unnecessary forbidden api suppressions
for the entire class, instead using a LongSupplier for the memory to
isolate the platform specific bean references.

relates #85758

Author: rjernst

distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/DefaultSystemMemoryInfo.java

@@ -11,28 +11,26 @@
 import com.sun.management.OperatingSystemMXBean;
 
 import java.lang.management.ManagementFactory;
+import java.util.function.LongSupplier;
 
 /**
  * A {@link SystemMemoryInfo} which delegates to {@link OperatingSystemMXBean}.
- *
- * <p>Prior to JDK 14 {@link OperatingSystemMXBean} did not take into consideration container memory limits when reporting total system
- * memory. Therefore attempts to use this implementation on earlier JDKs will result in an {@link SystemMemoryInfoException}.
  */
-@SuppressForbidden(reason = "Using com.sun internals is the only way to query total system memory")
 public final class DefaultSystemMemoryInfo implements SystemMemoryInfo {
-    private final OperatingSystemMXBean operatingSystemMXBean;
+    private final LongSupplier totalMemory;
 
     public DefaultSystemMemoryInfo() {
-        this.operatingSystemMXBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
+        this.totalMemory = getOSBeanMemoryGetter();
     }
 
-    @Override
-    @SuppressWarnings("deprecation")
-    public long availableSystemMemory() throws SystemMemoryInfoException {
-        if (Runtime.version().feature() < 14) {
-            throw new SystemMemoryInfoException("The minimum required Java version is 14 to use " + this.getClass().getName());
-        }
+    @SuppressForbidden(reason = "Using com.sun internals is the only way to query total system memory")
+    private static LongSupplier getOSBeanMemoryGetter() {
+        OperatingSystemMXBean bean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
+        return bean::getTotalMemorySize;
+    }
 
-        return operatingSystemMXBean.getTotalPhysicalMemorySize();
+    @Override
+    public long availableSystemMemory() {
+        return totalMemory.getAsLong();
     }
 }

distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/MachineDependentHeap.java

@@ -71,14 +71,8 @@ public List<String> determineHeapSettings(Path configDir, List<String> userDefin
 
     List<String> determineHeapSettings(InputStream config) {
         MachineNodeRole nodeRole = NodeRoleParser.parse(config);
-
-        try {
-            long availableSystemMemory = systemMemoryInfo.availableSystemMemory();
-            return options(nodeRole.heap(availableSystemMemory));
-        } catch (SystemMemoryInfo.SystemMemoryInfoException e) {
-            // If unable to determine system memory (ex: incompatible jdk version) fallback to defaults
-            return options(DEFAULT_HEAP_SIZE_MB);
-        }
+        long availableSystemMemory = systemMemoryInfo.availableSystemMemory();
+        return options(nodeRole.heap(availableSystemMemory));
     }
 
     private static List<String> options(int heapSize) {

distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/OverridableSystemMemoryInfo.java

@@ -27,7 +27,7 @@ public OverridableSystemMemoryInfo(final List<String> userDefinedJvmOptions, Sys
     }
 
     @Override
-    public long availableSystemMemory() throws SystemMemoryInfoException {
+    public long availableSystemMemory() {
 
         return userDefinedJvmOptions.stream()
             .filter(option -> option.startsWith("-Des.total_memory_bytes="))

distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemMemoryInfo.java

@@ -19,13 +19,6 @@ public interface SystemMemoryInfo {
     /**
      *
      * @return total system memory available to heap or native process allocation in bytes
-     * @throws SystemMemoryInfoException if unable to determine available system memory
      */
-    long availableSystemMemory() throws SystemMemoryInfoException;
-
-    class SystemMemoryInfoException extends Exception {
-        public SystemMemoryInfoException(String message) {
-            super(message);
-        }
-    }
+    long availableSystemMemory();
 }

distribution/tools/launchers/src/test/java/org/elasticsearch/tools/launchers/MachineDependentHeapTests.java

@@ -77,12 +77,6 @@ public void testDataNodeOptions() {
         assertThat(options, containsInAnyOrder("-Xmx128m", "-Xms128m"));
     }
 
-    public void testFallbackOptions() throws Exception {
-        MachineDependentHeap machineDependentHeap = new MachineDependentHeap(errorThrowingMemoryInfo());
-        List<String> options = machineDependentHeap.determineHeapSettings(configPath(), Collections.emptyList());
-        assertThat(options, containsInAnyOrder("-Xmx1024m", "-Xms1024m"));
-    }
-
     private static List<String> calculateHeap(double memoryInGigabytes, String... roles) {
         MachineDependentHeap machineDependentHeap = new MachineDependentHeap(systemMemoryInGigabytes(memoryInGigabytes));
         String configYaml = "node.roles: [" + String.join(",", roles) + "]";
@@ -101,10 +95,6 @@ private static SystemMemoryInfo systemMemoryInGigabytes(double gigabytes) {
         return () -> (long) (gigabytes * 1024 * 1024 * 1024);
     }
 
-    private static SystemMemoryInfo errorThrowingMemoryInfo() {
-        return () -> { throw new SystemMemoryInfo.SystemMemoryInfoException("something went wrong"); };
-    }
-
     private static Path configPath() {
         URL resource = MachineDependentHeapTests.class.getResource("/config/elasticsearch.yml");
         try {

distribution/tools/launchers/src/test/java/org/elasticsearch/tools/launchers/OverridableSystemMemoryInfoTests.java

@@ -8,8 +8,6 @@
 
 package org.elasticsearch.tools.launchers;
 
-import org.elasticsearch.tools.launchers.SystemMemoryInfo.SystemMemoryInfoException;
-
 import java.util.List;
 
 import static org.hamcrest.Matchers.is;
@@ -20,41 +18,41 @@ public class OverridableSystemMemoryInfoTests extends LaunchersTestCase {
 
     private static final long FALLBACK = -1L;
 
-    public void testNoOptions() throws SystemMemoryInfoException {
+    public void testNoOptions() {
         final SystemMemoryInfo memoryInfo = new OverridableSystemMemoryInfo(List.of(), fallbackSystemMemoryInfo());
         assertThat(memoryInfo.availableSystemMemory(), is(FALLBACK));
     }
 
-    public void testNoOverrides() throws SystemMemoryInfoException {
+    public void testNoOverrides() {
         final SystemMemoryInfo memoryInfo = new OverridableSystemMemoryInfo(List.of("-Da=b", "-Dx=y"), fallbackSystemMemoryInfo());
         assertThat(memoryInfo.availableSystemMemory(), is(FALLBACK));
     }
 
-    public void testValidSingleOverride() throws SystemMemoryInfoException {
+    public void testValidSingleOverride() {
         final SystemMemoryInfo memoryInfo = new OverridableSystemMemoryInfo(
             List.of("-Des.total_memory_bytes=123456789"),
             fallbackSystemMemoryInfo()
         );
         assertThat(memoryInfo.availableSystemMemory(), is(123456789L));
     }
 
-    public void testValidOverrideInList() throws SystemMemoryInfoException {
+    public void testValidOverrideInList() {
         final SystemMemoryInfo memoryInfo = new OverridableSystemMemoryInfo(
             List.of("-Da=b", "-Des.total_memory_bytes=987654321", "-Dx=y"),
             fallbackSystemMemoryInfo()
         );
         assertThat(memoryInfo.availableSystemMemory(), is(987654321L));
     }
 
-    public void testMultipleValidOverridesInList() throws SystemMemoryInfoException {
+    public void testMultipleValidOverridesInList() {
         final SystemMemoryInfo memoryInfo = new OverridableSystemMemoryInfo(
             List.of("-Des.total_memory_bytes=123456789", "-Da=b", "-Des.total_memory_bytes=987654321", "-Dx=y"),
             fallbackSystemMemoryInfo()
         );
         assertThat(memoryInfo.availableSystemMemory(), is(987654321L));
     }
 
-    public void testNegativeOverride() throws SystemMemoryInfoException {
+    public void testNegativeOverride() {
         final SystemMemoryInfo memoryInfo = new OverridableSystemMemoryInfo(
             List.of("-Da=b", "-Des.total_memory_bytes=-123", "-Dx=y"),
             fallbackSystemMemoryInfo()
@@ -67,7 +65,7 @@ public void testNegativeOverride() throws SystemMemoryInfoException {
         }
     }
 
-    public void testUnparsableOverride() throws SystemMemoryInfoException {
+    public void testUnparsableOverride() {
         final SystemMemoryInfo memoryInfo = new OverridableSystemMemoryInfo(
             List.of("-Da=b", "-Des.total_memory_bytes=invalid", "-Dx=y"),
             fallbackSystemMemoryInfo()