summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2021-01-12 16:29:12 +0100
committerGitHub <noreply@github.com>2021-01-12 16:29:12 +0100
commit3af508945a49a03494e91aba2934d6bade6141cc (patch)
treea7f74877db30e711ef037b812aefbdd3f20f4962
parent6894e4ec290192511f28941194cb37fd60d22b91 (diff)
parent7fe6943d6409a4d8838fb1c618e10b8dfae40382 (diff)
Merge pull request #16020 from vespa-engine/jonmv/more-forceful-reindexer-shutdown
More foreceful reindexing shutdown
-rw-r--r--clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
index e62314429fb..9cb1981c230 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
@@ -110,7 +110,8 @@ public class ReindexingMaintainer extends AbstractComponent {
log.log(WARNING, "Interrupted while waiting for reindexing to shut down");
Thread.currentThread().interrupt();
}
-
+ if ( ! executor.isShutdown())
+ executor.shutdownNow();
}
static Map<DocumentType, Instant> parseReady(ReindexingConfig.Clusters cluster, DocumentTypeManager manager) {