diff options
Diffstat (limited to 'node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent')
2 files changed, 5 insertions, 4 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java index f93cd005fae..5ea0a5d12c3 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java @@ -244,7 +244,7 @@ public class NodeAgentContextImpl implements NodeAgentContext { return this; } - public Builder dockerNetworking(ContainerNetworkMode containerNetworkMode) { + public Builder networkMode(ContainerNetworkMode containerNetworkMode) { this.containerNetworkMode = containerNetworkMode; return this; } 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 9fa21e5a676..dc0b6dc9d85 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 @@ -393,12 +393,13 @@ public class NodeAgentImpl implements NodeAgent { return zone.getEnvironment() == Environment.dev || zone.getSystemName().isCd(); } - private boolean downloadImageIfNeeded(NodeSpec node, Optional<Container> container) { + private boolean downloadImageIfNeeded(NodeAgentContext context, Optional<Container> container) { + NodeSpec node = context.node(); if (node.wantedDockerImage().equals(container.map(c -> c.image))) return false; RegistryCredentials credentials = registryCredentialsProvider.get(); return node.wantedDockerImage() - .map(image -> containerOperations.pullImageAsyncIfNeeded(image, credentials)) + .map(image -> containerOperations.pullImageAsyncIfNeeded(context, image, credentials)) .orElse(false); } @@ -454,7 +455,7 @@ public class NodeAgentImpl implements NodeAgent { storageMaintainer.cleanDiskIfFull(context); storageMaintainer.handleCoreDumpsForContainer(context, container); - if (downloadImageIfNeeded(node, container)) { + if (downloadImageIfNeeded(context, container)) { context.log(logger, "Waiting for image to download " + context.node().wantedDockerImage().get().asString()); return; } |