Merge pull request #7591 from vespa-engine/hakonhall/print-message-only-on-convergenceexception

Print message only on ConvergenceException

2 files changed, 12 insertions, 5 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/ConvergenceException.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/ConvergenceException.java
index 07e16c9b610..8c1663bcf49 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/ConvergenceException.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/ConvergenceException.java
@@ -1,9 +1,18 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.nodeadmin;
 
+/**
+ * Exception specially handled to avoid dumping full stack trace on convergence failure.
+ *
+ * @author hakonhall
+ */
 @SuppressWarnings("serial")
 public class ConvergenceException extends RuntimeException {
     public ConvergenceException(String message) {
         super(message);
     }
+
+    public ConvergenceException(String message, Throwable t) {
+        super(message, t);
+    }
 }
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 8ef1fb75395..f634b19cd50 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
@@ -24,6 +24,7 @@ import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator;
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.OrchestratorException;
 import com.yahoo.vespa.hosted.node.admin.maintenance.acl.AclMaintainer;
 import com.yahoo.vespa.hosted.node.admin.maintenance.identity.AthenzCredentialsMaintainer;
+import com.yahoo.vespa.hosted.node.admin.nodeadmin.ConvergenceException;
 import com.yahoo.vespa.hosted.node.admin.util.SecretAgentCheckConfig;
 import com.yahoo.vespa.hosted.provision.Node;
 
@@ -428,15 +429,12 @@ public class NodeAgentImpl implements NodeAgent {
             isFrozenCopy = isFrozen;
         }
 
-        boolean converged = false;
-
         if (isFrozenCopy) {
             context.log(logger, LogLevel.DEBUG, "tick: isFrozen");
         } else {
             try {
                 converge();
-                converged = true;
-            } catch (OrchestratorException e) {
+            } catch (OrchestratorException | ConvergenceException e) {
                 context.log(logger, e.getMessage());
             } catch (ContainerNotFoundException e) {
                 containerState = ABSENT;
@@ -655,7 +653,7 @@ public class NodeAgentImpl implements NodeAgent {
             }
             String wrappedMetrics = "s:" + params.toString();
 
-            // Push metrics to the metrics proxy in each container - give it maximum 1 seconds to complete
+            // Push metrics to the metrics proxy in each container
             String[] command = {"vespa-rpc-invoke",  "-t", "2",  "tcp/localhost:19091",  "setExtraMetrics", wrappedMetrics};
             dockerOperations.executeCommandInContainerAsRoot(context, 5L, command);
         } catch (DockerExecTimeoutException | JsonProcessingException  e) {