diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-11-11 13:27:41 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-11-11 13:28:18 +0100 |
commit | 4031334764df59bb3036b862ead7c1384f7e2754 (patch) | |
tree | 08dac2d4fd47221600762356ea8a3f5eb5bf286a | |
parent | 8d1cabe631a5a85c000bac303a90eb4149f6e73c (diff) |
Log OS version fields of parent host
2 files changed, 6 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 224f7734766..4cc4880591e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -1,4 +1,4 @@ -// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.deployment; import com.google.common.collect.ImmutableSet; @@ -541,7 +541,7 @@ public class InternalStepRunner implements StepRunner { ? " <-- " + currentPlatform(node.node()) : "") + (node.needsOsUpgrade() && node.isAllowedDown() - ? ", upgrading OS (" + node.node().wantedOsVersion() + " <-- " + node.node().currentOsVersion() + ")" + ? ", upgrading OS (" + node.parent().wantedOsVersion() + " <-- " + node.parent().currentOsVersion() + ")" : "") + (node.needsFirmwareUpgrade() && node.isAllowedDown() ? ", upgrading firmware" diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java index fbfdac427e4..2d336143138 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java @@ -1,6 +1,6 @@ +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.deployment; - import com.yahoo.collections.AbstractFilteringList; import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ServiceConvergence; @@ -12,6 +12,9 @@ import java.util.stream.Collectors; import static java.util.stream.Collectors.groupingBy; +/** + * @author jonmv + */ public class NodeList extends AbstractFilteringList<NodeWithServices, NodeList> { private final long wantedConfigGeneration; |