diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-03-08 12:38:21 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-03-08 12:38:21 +0100 |
commit | 583936a582883f10ccdedb6d4b9d64ef3b925aef (patch) | |
tree | 82d5424a10386c4606132901913372d52927642e /node-admin | |
parent | b172653f49ecd77d998e7a0161a96f6110dfcb1a (diff) |
Correct pull image optimization
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 c4bef1fcc2f..41755681ba3 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 @@ -363,8 +363,8 @@ public class NodeAgentImpl implements NodeAgent { } - private void scheduleDownLoadIfNeeded(NodeSpec node) { - if (node.getCurrentDockerImage().equals(node.getWantedDockerImage())) return; + private void scheduleDownLoadIfNeeded(NodeSpec node, Optional<Container> container) { + if (node.getWantedDockerImage().equals(container.map(c -> c.image))) return; if (dockerOperations.pullImageAsyncIfNeeded(node.getWantedDockerImage().get())) { imageBeingDownloaded = node.getWantedDockerImage().get(); @@ -432,7 +432,7 @@ public class NodeAgentImpl implements NodeAgent { .filter(diskUtil -> diskUtil >= 0.8) .ifPresent(diskUtil -> storageMaintainer.removeOldFilesFromNode(context)); - scheduleDownLoadIfNeeded(node); + scheduleDownLoadIfNeeded(node, container); if (isDownloadingImage()) { context.log(logger, "Waiting for image to download " + imageBeingDownloaded.asString()); return; |