diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-10-10 14:24:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-10 14:24:08 +0200 |
| commit | b5e9551aef5230904d726b47578b4cb6b1fcfe2d (patch) | |
| tree | d7d2fcd50ef42e102e573a316fa1a2831d3f4618 /controller-server/src/main/java/com | |
| parent | 42707ddb5a30dc4e530e2f5d2d56539462a62ad9 (diff) | |
| parent | d2da4ed4e287dd40d36bc5ded8c1ecce4f100d8d (diff) | |
Merge pull request #28851 from vespa-engine/jonmv/random-fix
Jonmv/random fix
Diffstat (limited to 'controller-server/src/main/java/com')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java index cbd0fce60ce..6f00ff39637 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java @@ -62,9 +62,9 @@ public class JobRunner extends ControllerMaintainer { public void awaitShutdown() { super.awaitShutdown(); try { - if ( ! executors.awaitTermination(10, TimeUnit.SECONDS)) { + if ( ! executors.awaitTermination(40, TimeUnit.SECONDS)) { executors.shutdownNow(); - if ( ! executors.awaitTermination(40, TimeUnit.SECONDS)) + if ( ! executors.awaitTermination(10, TimeUnit.SECONDS)) throw new IllegalStateException("Failed shutting down " + JobRunner.class.getName()); } } |