From f1c7166fc2c96e6d5e44c7930b814470a2651c00 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Wed, 7 Nov 2018 14:23:33 +0100 Subject: Print message only on ConvergenceException --- .../yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'node-admin') 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) { -- cgit v1.2.3 From a2639311995aa4e721a3cdfa4a923d631985e860 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Wed, 7 Nov 2018 16:11:03 +0100 Subject: Add constructor for feature parity --- .../vespa/hosted/node/admin/nodeadmin/ConvergenceException.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'node-admin') 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); + } } -- cgit v1.2.3