summaryrefslogtreecommitdiffstats
path: root/zookeeper-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-12-14 15:10:51 +0100
committerMartin Polden <mpolden@mpolden.no>2020-12-14 15:10:51 +0100
commit796bed3f67282c835bc5f6cccc457d07179332ed (patch)
treed063511d9c00ec9a49ba59fd25c9e5460028aa93 /zookeeper-server
parent3346deb478823faf709d8de39bc7e6508436ca0a (diff)
Never attempt to start again after executor has shut down
Diffstat (limited to 'zookeeper-server')
-rw-r--r--zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
index 016d97835ac..71ac4bbf62f 100644
--- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
+++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
@@ -74,7 +74,7 @@ public class ZooKeeperRunner implements Runnable {
log.log(Level.INFO, "Failed interrupting task", e);
}
}
- } while (Instant.now().isBefore(end));
+ } while (Instant.now().isBefore(end) && !executorService.isShutdown());
}
private void startServer(Path path) {