Skip to content

Commit d0e19ae

Browse files
tsawadacopybara-github
authored andcommitted
Use local_termination_grace_seconds when testing LinuxSandbox availability
A 1s timeout was introduced in checking whether LinuxSandbox is available, to prevent a complete hangup on broken systems. However, it turned out that it occasionally results in misjudging that linux-sandbox being not available. `local_termination_grace_seconds` defaults to 15s, which hopefully gives more headroom and configurability in various setups. Fixes #18071 Closes #18151. PiperOrigin-RevId: 536953768 Change-Id: I5d344ee5bf06cb9b13a2cba9d077f0981f4430a3
1 parent 188b4ef commit d0e19ae

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/main/java/com/google/devtools/build/lib/sandbox/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ java_library(
257257
"//src/main/java/com/google/devtools/build/lib/exec:spawn_runner",
258258
"//src/main/java/com/google/devtools/build/lib/exec:tree_deleter",
259259
"//src/main/java/com/google/devtools/build/lib/exec/local",
260+
"//src/main/java/com/google/devtools/build/lib/exec/local:options",
260261
"//src/main/java/com/google/devtools/build/lib/profiler",
261262
"//src/main/java/com/google/devtools/build/lib/shell",
262263
"//src/main/java/com/google/devtools/build/lib/util:os",

src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.google.devtools.build.lib.events.Reporter;
3838
import com.google.devtools.build.lib.exec.TreeDeleter;
3939
import com.google.devtools.build.lib.exec.local.LocalEnvProvider;
40+
import com.google.devtools.build.lib.exec.local.LocalExecutionOptions;
4041
import com.google.devtools.build.lib.exec.local.PosixLocalEnvProvider;
4142
import com.google.devtools.build.lib.profiler.Profiler;
4243
import com.google.devtools.build.lib.profiler.SilentCloseable;
@@ -103,10 +104,11 @@ public static boolean isSupported(final CommandEnvironment cmdEnv) throws Interr
103104

104105
private static boolean computeIsSupported(CommandEnvironment cmdEnv, Path linuxSandbox)
105106
throws InterruptedException {
107+
LocalExecutionOptions options = cmdEnv.getOptions().getOptions(LocalExecutionOptions.class);
106108
ImmutableList<String> linuxSandboxArgv =
107109
LinuxSandboxCommandLineBuilder.commandLineBuilder(
108110
linuxSandbox, ImmutableList.of("/bin/true"))
109-
.setTimeout(Duration.ofSeconds(1))
111+
.setTimeout(options.getLocalSigkillGraceSeconds())
110112
.build();
111113
ImmutableMap<String, String> env = ImmutableMap.of();
112114
Path execRoot = cmdEnv.getExecRoot();

0 commit comments

Comments
 (0)