Revert "Check the result of Future.cancel() when cancelling the other branch of dynamic execution."

larsrc-google · larsrc-google · commit e6809c90ecc0 · 2021-07-30T18:17:55.000+02:00
This reverts commit 5b95d91.
diff --git a/src/main/java/com/google/devtools/build/lib/actions/DynamicStrategyRegistry.java b/src/main/java/com/google/devtools/build/lib/actions/DynamicStrategyRegistry.java
@@ -34,10 +34,6 @@ enum DynamicMode {
     public String toString() {
       return name;
     }
-
-    public DynamicMode other() {
-      return this == REMOTE ? LOCAL : REMOTE;
-    }
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategy.java
@@ -166,17 +166,7 @@ private static void stopBranch(
                           spawn.getMnemonic(), strategyThatCancelled.get())));
         }
 
-        if (!branchToCancel.cancel(true)) {
-          // This can happen if the other branch is local under local_lockfree and has returned
-          // its result but not yet cancelled this branch, or if the other branch was already
-          // cancelled for other reasons.
-          if (!branchToCancel.isCancelled()) {
-            throw new DynamicInterruptedException(
-                String.format(
-                    "Execution of %s strategy stopped because %s strategy could not be cancelled",
-                    cancellingStrategy, cancellingStrategy.other()));
-          }
-        }
+        branchToCancel.cancel(true);
         branchDone.acquire();
       } else {
         throw new DynamicInterruptedException(

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,6 @@ enum DynamicMode {`
`34`	`34`	`public String toString() {`
`35`	`35`	`return name;`
`36`	`36`	`}`
`37`		`-`
`38`		`- public DynamicMode other() {`
`39`		`- return this == REMOTE ? LOCAL : REMOTE;`
`40`		`- }`
`41`	`37`	`}`
`42`	`38`
`43`	`39`	`/**`