do not suppress exceptions from invalidateCache()

apache · Sep 26, 2024 · ec286e8 · ec286e8
1 parent d6db7c8
commit ec286e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.../main/java/org/apache/beam/runners/dataflow/worker/streaming/ComputationWorkExecutor.java b/.../main/java/org/apache/beam/runners/dataflow/worker/streaming/ComputationWorkExecutor.java
@@ -83,11 +83,11 @@ public final void executeWork(
    * cannot be reused.
    */
   public final void invalidate() {
+    context().invalidateCache();
     try {
-      context().invalidateCache();
       workExecutor().close();
     } catch (Exception e) {
-      LOG.warn("Failed to invalidate ComputationWorkExecutor: ", e);
+      LOG.warn("Failed to close map task executor: ", e);
     }
   }
 

diff --git a/...t/java/org/apache/beam/runners/dataflow/worker/streaming/ComputationWorkExecutorTest.java b/...t/java/org/apache/beam/runners/dataflow/worker/streaming/ComputationWorkExecutorTest.java
@@ -21,7 +21,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyNoInteractions;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.beam.runners.core.metrics.ExecutionStateTracker;
@@ -50,11 +49,13 @@ public void setUp() {
   }
 
   @Test
-  public void testInvalidate_handlesException() {
-    NullPointerException npe = new NullPointerException("something bad happened");
-    doThrow(npe).when(context).invalidateCache();
+  public void testInvalidate_withoutCallToStart() {
+    // Call to invalidate w/o a call to start should not fail.
     computationWorkExecutor.invalidate();
-    verifyNoInteractions(dataflowWorkExecutor);
+  }
+
+  @Test
+  public void testInvalidate_handlesException() {
     AtomicBoolean verifyContextInvalidated = new AtomicBoolean(false);
     Throwable e = new RuntimeException("something bad happened 2");
     doThrow(e).when(dataflowWorkExecutor).close();