diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2018-10-18 09:50:36 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2018-10-18 09:50:36 +0200 |
| commit | 536fc1bc2d362dc690c443e2ec50af37f71e9ece (patch) | |
| tree | 4b768e8ac4b66363dfcbdf74e02f941bcd178248 /node-admin | |
| parent | fb2a18047633ba46719573506a5e89f8c18a7325 (diff) | |
Minor fixes
Diffstat (limited to 'node-admin')
2 files changed, 2 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java index bbea505b19d..22093258930 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java @@ -70,7 +70,7 @@ public class AthenzCredentialsMaintainer { private final CsrGenerator csrGenerator; // Used as an optimization to ensure ZTS is not DDoS'ed on continuously failing refresh attempts - private Map<ContainerName, Instant> lastRefreshAttempt = new ConcurrentHashMap<>(); + private final Map<ContainerName, Instant> lastRefreshAttempt = new ConcurrentHashMap<>(); public AthenzCredentialsMaintainer(URI ztsEndpoint, Path trustStorePath, 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 c3a6eabea2b..aa3b58be1cc 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 @@ -337,7 +337,7 @@ public class NodeAgentImpl implements NodeAgent { } if (node.getWantedDockerImage().isPresent() && !node.getWantedDockerImage().get().equals(existingContainer.image)) { return Optional.of("The node is supposed to run a new Docker image: " - + existingContainer + " -> " + node.getWantedDockerImage().get()); + + existingContainer.image.asString() + " -> " + node.getWantedDockerImage().get().asString()); } if (!existingContainer.state.isRunning()) { return Optional.of("Container no longer running"); |