[7.1.0] Make SpawnLogContext interruptible. (#21337)

To simplify a followup change. PiperOrigin-RevId: 606551475 Change-Id: I1a6b32352fce3beeb4f903079a50f6a5429d44d6
bazelbuild · Feb 13, 2024 · 579ee71 · 579ee71
1 parent 2ce2960
commit 579ee71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java
@@ -71,7 +71,7 @@ public abstract void logSpawn(
       FileSystem fileSystem,
       Duration timeout,
       SpawnResult result)
-      throws IOException, ExecException;
+      throws IOException, InterruptedException, ExecException;
 
   /** Finishes writing the log and performs any required post-processing. */
   public abstract void close() throws IOException;

diff --git a/src/test/java/com/google/devtools/build/lib/exec/CompactSpawnLogContextTest.java b/src/test/java/com/google/devtools/build/lib/exec/CompactSpawnLogContextTest.java
@@ -99,7 +99,7 @@ public void testTransitiveNestedSet(@TestParameter InputsMode inputsMode) throws
 
   @Override
   protected SpawnLogContext createSpawnLogContext(ImmutableMap<String, String> platformProperties)
-      throws IOException {
+      throws IOException, InterruptedException {
     RemoteOptions remoteOptions = Options.getDefaults(RemoteOptions.class);
     remoteOptions.remoteDefaultExecProperties = platformProperties.entrySet().asList();
 
@@ -113,7 +113,7 @@ protected SpawnLogContext createSpawnLogContext(ImmutableMap<String, String> pla
 
   @Override
   protected void closeAndAssertLog(SpawnLogContext context, SpawnExec... expected)
-      throws IOException {
+      throws IOException, InterruptedException {
     context.close();
 
     ArrayList<SpawnExec> actual = new ArrayList<>();

diff --git a/src/test/java/com/google/devtools/build/lib/exec/ExpandedSpawnLogContextTest.java b/src/test/java/com/google/devtools/build/lib/exec/ExpandedSpawnLogContextTest.java
@@ -37,7 +37,7 @@ public final class ExpandedSpawnLogContextTest extends SpawnLogContextTestBase {
 
   @Override
   protected SpawnLogContext createSpawnLogContext(ImmutableMap<String, String> platformProperties)
-      throws IOException {
+      throws IOException, InterruptedException {
     RemoteOptions remoteOptions = Options.getDefaults(RemoteOptions.class);
     remoteOptions.remoteDefaultExecProperties = platformProperties.entrySet().asList();
 
@@ -54,7 +54,7 @@ protected SpawnLogContext createSpawnLogContext(ImmutableMap<String, String> pla
 
   @Override
   protected void closeAndAssertLog(SpawnLogContext context, SpawnExec... expected)
-      throws IOException {
+      throws IOException, InterruptedException {
     context.close();
 
     ArrayList<SpawnExec> actual = new ArrayList<>();

diff --git a/src/test/java/com/google/devtools/build/lib/exec/SpawnLogContextTestBase.java b/src/test/java/com/google/devtools/build/lib/exec/SpawnLogContextTestBase.java
@@ -957,12 +957,12 @@ protected static TreeArtifactValue createTreeArtifactValue(Artifact tree) throws
     return builder.build();
   }
 
-  protected SpawnLogContext createSpawnLogContext() throws IOException {
+  protected SpawnLogContext createSpawnLogContext() throws IOException, InterruptedException {
     return createSpawnLogContext(ImmutableSortedMap.of());
   }
 
   protected abstract SpawnLogContext createSpawnLogContext(
-      ImmutableMap<String, String> platformProperties) throws IOException;
+      ImmutableMap<String, String> platformProperties) throws IOException, InterruptedException;
 
   protected Digest getDigest(String content) {
     return Digest.newBuilder()
@@ -982,5 +982,5 @@ protected static void writeFile(Path path, String contents) throws IOException {
   }
 
   protected abstract void closeAndAssertLog(SpawnLogContext context, SpawnExec... expected)
-      throws IOException;
+      throws IOException, InterruptedException;
 }