summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorhakonhall <hakon@yahoo-inc.com>2017-03-16 12:44:22 +0100
committerGitHub <noreply@github.com>2017-03-16 12:44:22 +0100
commitdcdf9840ee1c278e15c7352ba7803f0e161a9912 (patch)
treeb666a6fd62aa079a1d8ddd9110bb3f78f3cb8a94 /node-admin
parent1d41b5743e7bad0af2d63047bd4494cf6cca4bae (diff)
parent70d08d5355907301cdb0caab29c3e6a849a0352b (diff)
Merge pull request #2019 from yahoo/musum/handle-orchestator-exception
Handle OrchestratorException (avoid updating metric)
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index f91b8d2ad47..14a46ab0b9a 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -417,6 +417,9 @@ public class NodeAgentImpl implements NodeAgent {
} else {
try {
tick();
+ } catch (OrchestratorException e) {
+ logger.info(e.getMessage());
+ addDebugMessage(e.getMessage());
} catch (Exception e) {
numberOfUnhandledException++;
logger.error("Unhandled exception, ignoring.", e);