diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-12-08 07:39:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-08 07:39:12 +0100 |
| commit | ea73365868e5004fe21a26bcb0c9123f9bc77a00 (patch) | |
| tree | b0b5f4e5c0e4782c9e1930cda297309730efdf28 /clustercontroller-reindexer | |
| parent | 66721d0986c251286c562d4d650c274ffbe4d08a (diff) | |
| parent | 71b593e14a2ae149af28e78fb76b57f8e7767b19 (diff) | |
Merge pull request #15732 from vespa-engine/revert-15731-revert-15724-revert-15723-revert-15715-jonmv/deconstruct-in-order
Revert "Revert "Revert "Revert "Always deconstruct in reverse creation order, including Provider objects""""
Diffstat (limited to 'clustercontroller-reindexer')
| -rw-r--r-- | clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java index 98c22884b01..ebd6837a97f 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java @@ -168,7 +168,7 @@ public class Reindexer { // Wait until done; or until termination is forced, in which we shut down the visitor session immediately. phaser.arriveAndAwaitAdvance(); // Synchronize with visitor completion. - sessionShutdown.run(); // Shutdown aborts the session, then waits for it to terminate normally. + sessionShutdown.run(); // Shutdown aborts the session unless already complete, then waits for it to terminate normally. switch (control.getResult().getCode()) { default: |