java binary: pass MaxFDLimit option

Summary: ^ Reviewed By: jiawei-lyu fbshipit-source-id: b18f3de245adc7f1d5b33750c4b59bd6130912c4
facebook · Sep 27, 2021 · 548ec37 · 548ec37
1 parent 613b454
commit 548ec37
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/com/facebook/buck/jvm/java/JavaBinary.java b/src/com/facebook/buck/jvm/java/JavaBinary.java
@@ -239,6 +239,9 @@ public Tool getExecutableCommand(OutputLabel outputLabel) {
         getBuildTarget());
 
     return new CommandTool.Builder(javaRuntimeLauncher)
+        // Directs the VM to refrain from setting the file descriptor limit to the default maximum.
+        // https://stackoverflow.com/a/16535804/5208808
+        .addArg("-XX:-MaxFDLimit")
         .addArg("-jar")
         .addArg(SourcePathArg.of(getSourcePathToOutput()))
         .build();

diff --git a/test/com/facebook/buck/downwardapi/processexecutor/DownwardApiProcessExecutorTest.java b/test/com/facebook/buck/downwardapi/processexecutor/DownwardApiProcessExecutorTest.java
@@ -139,7 +139,7 @@ public void afterTest() {
     }
   }
 
-  @Rule public Timeout globalTestTimeout = Timeout.seconds(10);
+  @Rule public Timeout globalTestTimeout = Timeout.seconds(30);
   @Rule public TestName testName = new TestName();
 
   @Rule public TestLogSink testToolLogSink = new TestLogSink(TEST_LOGGER_NAME);

diff --git a/test/com/facebook/buck/jvm/java/JavaBinaryTest.java b/test/com/facebook/buck/jvm/java/JavaBinaryTest.java
@@ -108,7 +108,11 @@ public void testGetExecutableCommand() {
         basePath + pathResolver.getCellUnsafeRelPath(javaBinary.getSourcePathToOutput());
 
     List<String> expectedCommand =
-        ImmutableList.of(JavaRuntimeUtils.getBucksJavaBinCommand(), "-jar", expectedClasspath);
+        ImmutableList.of(
+            JavaRuntimeUtils.getBucksJavaBinCommand(),
+            "-XX:-MaxFDLimit",
+            "-jar",
+            expectedClasspath);
     assertEquals(
         expectedCommand,
         javaBinary.getExecutableCommand(OutputLabel.defaultLabel()).getCommandPrefix(pathResolver));

diff --git a/test/com/facebook/buck/rules/macros/ExecutableMacroExpanderTest.java b/test/com/facebook/buck/rules/macros/ExecutableMacroExpanderTest.java
@@ -99,7 +99,8 @@ public void testReplaceBinaryBuildRuleRefsInCmd() throws Exception {
             .toAbsolutePath();
     String expectedCmd =
         String.format(
-            "%s -jar %s $OUT", JavaRuntimeUtils.getBucksJavaBinCommand(), expectedClasspath);
+            "%s -XX:-MaxFDLimit -jar %s $OUT",
+            JavaRuntimeUtils.getBucksJavaBinCommand(), expectedClasspath);
     assertEquals(expectedCmd, transformedString);
   }
 
@@ -121,7 +122,8 @@ public void testReplaceRelativeBinaryBuildRuleRefsInCmd() throws Exception {
             .toAbsolutePath();
     String expectedCmd =
         String.format(
-            "%s -jar %s $OUT", JavaRuntimeUtils.getBucksJavaBinCommand(), expectedClasspath);
+            "%s -XX:-MaxFDLimit -jar %s $OUT",
+            JavaRuntimeUtils.getBucksJavaBinCommand(), expectedClasspath);
     assertEquals(expectedCmd, transformedString);
   }
 
@@ -144,7 +146,8 @@ public void testDepsGenrule() throws Exception {
             .toAbsolutePath();
     String expectedCmd =
         String.format(
-            "%s -jar %s $OUT", JavaRuntimeUtils.getBucksJavaBinCommand(), expectedClasspath);
+            "%s -XX:-MaxFDLimit -jar %s $OUT",
+            JavaRuntimeUtils.getBucksJavaBinCommand(), expectedClasspath);
     assertEquals(expectedCmd, transformedString);
   }