diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-02-03 10:46:52 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-02-03 10:46:52 +0100 |
commit | 0b45e844b3a2a2fcfd3d9b72799dfcdb844fd295 (patch) | |
tree | d8aacf021e82af8d7c4cbb8ad563703439b3343f /orchestrator/src/main | |
parent | 3e21ae3340cb49c0b28e8646e3eb1ae22d6241cc (diff) |
Avoid wrapping timeout exception (causing 504) with batch internal error (causing 500)
Diffstat (limited to 'orchestrator/src/main')
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java index 3232d2e5d9d..05268232119 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java @@ -254,6 +254,8 @@ public class OrchestratorImpl implements Orchestrator { suspendGroup(context.createSubcontextForSingleAppOp(probe), nodeGroup); } catch (HostStateChangeDeniedException e) { throw new BatchHostStateChangeDeniedException(parentHostname, nodeGroup, e); + } catch (UncheckedTimeoutException e) { + throw e; } catch (RuntimeException e) { throw new BatchInternalErrorException(parentHostname, nodeGroup, e); } |