diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-12-14 15:14:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 15:14:57 +0100 |
| commit | b012824fe389d2a6cbfc054d42ce24d7ec76490b (patch) | |
| tree | d063511d9c00ec9a49ba59fd25c9e5460028aa93 | |
| parent | 3346deb478823faf709d8de39bc7e6508436ca0a (diff) | |
| parent | 796bed3f67282c835bc5f6cccc457d07179332ed (diff) | |
Merge pull request #15808 from vespa-engine/mpolden/respect-shutdown
Never attempt to start again after executor has shut down
| -rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java | 2 |
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) { |