Avoid race in ReindexerTest

1 files changed, 4 insertions, 2 deletions

diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
index 4e54dea837b..d8d67bc6993 100644
--- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
+++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
@@ -129,8 +129,10 @@ class ReindexerTest {
             database.writeReindexing(Reindexing.empty()); // Wipe database to verify we write data from reindexer.
             parameters.getControlHandler().onProgress(new ProgressToken());
             aborted.get().shutdown();
-            executor.execute(() -> parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.ABORTED, "Shut down"));
-            return () -> shutDown.set(true);
+            return () -> {
+                shutDown.set(true);
+                parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.ABORTED, "Shut down");
+            };
         }, clock));
         aborted.get().reindex();
         reindexing = reindexing.with(music, Status.ready(clock.instant()).running().progressed(new ProgressToken()).halted());