diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-09-07 15:06:53 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-09-07 15:06:53 +0200 |
commit | e858dfe2815e6ffda326f69f1a62bcb0f4c2c3db (patch) | |
tree | fd8ec0e8c682497147f0ecf3ca2a6eee9d00c8dc /node-admin | |
parent | db9105023dc06c7ca56a2914735dba663bd21d5c (diff) |
Move to container engine neutral names
Diffstat (limited to 'node-admin')
20 files changed, 345 insertions, 345 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java index 94431f8ac57..168365a6dfd 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.node.admin.configserver.noderepository; import com.fasterxml.jackson.databind.JsonNode; import com.yahoo.component.Version; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import java.time.Instant; import java.util.Map; @@ -24,7 +24,7 @@ public class NodeAttributes { private Optional<Long> restartGeneration = Optional.empty(); private Optional<Long> rebootGeneration = Optional.empty(); - private Optional<DockerImage> dockerImage = Optional.empty(); + private Optional<ContainerImage> dockerImage = Optional.empty(); private Optional<Version> vespaVersion = Optional.empty(); private Optional<Version> currentOsVersion = Optional.empty(); private Optional<Instant> currentFirmwareCheck = Optional.empty(); @@ -47,8 +47,8 @@ public class NodeAttributes { return this; } - public NodeAttributes withDockerImage(DockerImage dockerImage) { - this.dockerImage = Optional.of(dockerImage); + public NodeAttributes withDockerImage(ContainerImage containerImage) { + this.dockerImage = Optional.of(containerImage); return this; } @@ -90,7 +90,7 @@ public class NodeAttributes { return rebootGeneration; } - public Optional<DockerImage> getDockerImage() { + public Optional<ContainerImage> getDockerImage() { return dockerImage; } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java index f7f231d5e0c..ce058a8c744 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.node.admin.configserver.noderepository; import com.fasterxml.jackson.databind.JsonNode; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.hosted.node.admin.task.util.file.DiskSize; @@ -28,8 +28,8 @@ public class NodeSpec { private final NodeType type; private final String flavor; - private final Optional<DockerImage> wantedDockerImage; - private final Optional<DockerImage> currentDockerImage; + private final Optional<ContainerImage> wantedDockerImage; + private final Optional<ContainerImage> currentDockerImage; private final Optional<Version> wantedVespaVersion; private final Optional<Version> currentVespaVersion; @@ -62,8 +62,8 @@ public class NodeSpec { public NodeSpec( String hostname, - Optional<DockerImage> wantedDockerImage, - Optional<DockerImage> currentDockerImage, + Optional<ContainerImage> wantedDockerImage, + Optional<ContainerImage> currentDockerImage, NodeState state, NodeType type, String flavor, @@ -138,11 +138,11 @@ public class NodeSpec { return flavor; } - public Optional<DockerImage> wantedDockerImage() { + public Optional<ContainerImage> wantedDockerImage() { return wantedDockerImage; } - public Optional<DockerImage> currentDockerImage() { + public Optional<ContainerImage> currentDockerImage() { return currentDockerImage; } @@ -341,8 +341,8 @@ public class NodeSpec { private NodeState state; private NodeType type; private String flavor; - private Optional<DockerImage> wantedDockerImage = Optional.empty(); - private Optional<DockerImage> currentDockerImage = Optional.empty(); + private Optional<ContainerImage> wantedDockerImage = Optional.empty(); + private Optional<ContainerImage> currentDockerImage = Optional.empty(); private Optional<Version> wantedVespaVersion = Optional.empty(); private Optional<Version> currentVespaVersion = Optional.empty(); private Optional<Version> wantedOsVersion = Optional.empty(); @@ -397,13 +397,13 @@ public class NodeSpec { return this; } - public Builder wantedDockerImage(DockerImage wantedDockerImage) { - this.wantedDockerImage = Optional.of(wantedDockerImage); + public Builder wantedDockerImage(ContainerImage wantedContainerImage) { + this.wantedDockerImage = Optional.of(wantedContainerImage); return this; } - public Builder currentDockerImage(DockerImage currentDockerImage) { - this.currentDockerImage = Optional.of(currentDockerImage); + public Builder currentDockerImage(ContainerImage currentContainerImage) { + this.currentDockerImage = Optional.of(currentContainerImage); return this; } @@ -556,11 +556,11 @@ public class NodeSpec { return hostname; } - public Optional<DockerImage> wantedDockerImage() { + public Optional<ContainerImage> wantedDockerImage() { return wantedDockerImage; } - public Optional<DockerImage> currentDockerImage() { + public Optional<ContainerImage> currentDockerImage() { return currentDockerImage; } @@ -673,7 +673,7 @@ public class NodeSpec { builder .owner(ApplicationId.defaultId()) .membership(new NodeMembership("container", "my-id", "group", 0, false)) .wantedVespaVersion(Version.fromString("7.1.1")) - .wantedDockerImage(DockerImage.fromString("docker.domain.tld/repo/image:7.1.1")) + .wantedDockerImage(ContainerImage.fromString("docker.domain.tld/repo/image:7.1.1")) .currentRestartGeneration(0) .wantedRestartGeneration(0); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java index 2e47410f1b5..08f16ac18a9 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Strings; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.host.FlavorOverrides; @@ -152,8 +152,8 @@ public class RealNodeRepository implements NodeRepository { NodeReports reports = NodeReports.fromMap(Optional.ofNullable(node.reports).orElseGet(Map::of)); return new NodeSpec( node.hostname, - Optional.ofNullable(node.wantedDockerImage).map(DockerImage::fromString), - Optional.ofNullable(node.currentDockerImage).map(DockerImage::fromString), + Optional.ofNullable(node.wantedDockerImage).map(ContainerImage::fromString), + Optional.ofNullable(node.currentDockerImage).map(ContainerImage::fromString), nodeState, nodeType, node.flavor, @@ -249,7 +249,7 @@ public class RealNodeRepository implements NodeRepository { public static NodeRepositoryNode nodeRepositoryNodeFromNodeAttributes(NodeAttributes nodeAttributes) { NodeRepositoryNode node = new NodeRepositoryNode(); - node.currentDockerImage = nodeAttributes.getDockerImage().map(DockerImage::asString).orElse(null); + node.currentDockerImage = nodeAttributes.getDockerImage().map(ContainerImage::asString).orElse(null); node.currentRestartGeneration = nodeAttributes.getRestartGeneration().orElse(null); node.currentRebootGeneration = nodeAttributes.getRebootGeneration().orElse(null); node.vespaVersion = nodeAttributes.getVespaVersion().map(Version::toFullString).orElse(null); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperations.java index ce4a915f09b..c7033000967 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperations.java @@ -1,7 +1,7 @@ // 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.docker; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.Container; import com.yahoo.vespa.hosted.dockerapi.ContainerResources; import com.yahoo.vespa.hosted.dockerapi.ContainerStats; @@ -14,7 +14,7 @@ import java.time.Duration; import java.util.List; import java.util.Optional; -public interface DockerOperations { +public interface ContainerOperations { void createContainer(NodeAgentContext context, ContainerData containerData, ContainerResources containerResources); @@ -26,7 +26,7 @@ public interface DockerOperations { Optional<Container> getContainer(NodeAgentContext context); - boolean pullImageAsyncIfNeeded(DockerImage dockerImage); + boolean pullImageAsyncIfNeeded(ContainerImage containerImage); ProcessResult executeCommandInContainerAsRoot(NodeAgentContext context, String... command); @@ -56,5 +56,5 @@ public interface DockerOperations { boolean noManagedContainersRunning(); /** Deletes the local images that are currently not in use by any container and not recently used. */ - boolean deleteUnusedDockerImages(List<DockerImage> excludes, Duration minImageAgeToDelete); + boolean deleteUnusedContainerImages(List<ContainerImage> excludes, Duration minImageAgeToDelete); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java index 65a9b2869b0..58f4026e24b 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java @@ -2,14 +2,14 @@ package com.yahoo.vespa.hosted.node.admin.docker; import com.google.common.net.InetAddresses; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.SystemName; import com.yahoo.vespa.hosted.dockerapi.Container; +import com.yahoo.vespa.hosted.dockerapi.ContainerEngine; import com.yahoo.vespa.hosted.dockerapi.ContainerResources; import com.yahoo.vespa.hosted.dockerapi.ContainerStats; -import com.yahoo.vespa.hosted.dockerapi.Docker; import com.yahoo.vespa.hosted.dockerapi.ProcessResult; import com.yahoo.vespa.hosted.node.admin.nodeadmin.ConvergenceException; import com.yahoo.vespa.hosted.node.admin.nodeagent.ContainerData; @@ -34,13 +34,13 @@ import java.util.logging.Logger; import java.util.stream.Stream; /** - * Class that wraps the Docker class and have some tools related to running programs in docker. + * Class that wraps the ContainerEngine class and have some tools related to running programs in containerEngine. * * @author Haakon Dybdahl */ -public class DockerOperationsImpl implements DockerOperations { +public class ContainerOperationsImpl implements ContainerOperations { - private static final Logger logger = Logger.getLogger(DockerOperationsImpl.class.getName()); + private static final Logger logger = Logger.getLogger(ContainerOperationsImpl.class.getName()); private static final String MANAGER_NAME = "node-admin"; @@ -50,13 +50,13 @@ public class DockerOperationsImpl implements DockerOperations { private static final Random random = new Random(System.nanoTime()); - private final Docker docker; + private final ContainerEngine containerEngine; private final Terminal terminal; private final IPAddresses ipAddresses; private final FileSystem fileSystem; - public DockerOperationsImpl(Docker docker, Terminal terminal, IPAddresses ipAddresses, FileSystem fileSystem) { - this.docker = docker; + public ContainerOperationsImpl(ContainerEngine containerEngine, Terminal terminal, IPAddresses ipAddresses, FileSystem fileSystem) { + this.containerEngine = containerEngine; this.terminal = terminal; this.ipAddresses = ipAddresses; this.fileSystem = fileSystem; @@ -66,7 +66,7 @@ public class DockerOperationsImpl implements DockerOperations { public void createContainer(NodeAgentContext context, ContainerData containerData, ContainerResources containerResources) { context.log(logger, "Creating container"); - Docker.CreateContainerCommand command = docker.createContainerCommand( + ContainerEngine.CreateContainerCommand command = containerEngine.createContainerCommand( context.node().wantedDockerImage().get(), context.containerName()) .withHostName(context.node().hostname()) .withResources(containerResources) @@ -168,7 +168,7 @@ public class DockerOperationsImpl implements DockerOperations { // the IP addresses needs to be local. StringBuilder etcHosts = new StringBuilder( - "# This file was generated by " + DockerOperationsImpl.class.getName() + "\n" + + "# This file was generated by " + ContainerOperationsImpl.class.getName() + "\n" + "127.0.0.1\tlocalhost\n" + "::1\tlocalhost ip6-localhost ip6-loopback\n" + "fe00::0\tip6-localnet\n" + @@ -184,48 +184,48 @@ public class DockerOperationsImpl implements DockerOperations { @Override public void startContainer(NodeAgentContext context) { context.log(logger, "Starting container"); - docker.startContainer(context.containerName()); + containerEngine.startContainer(context.containerName()); } @Override public void removeContainer(NodeAgentContext context, Container container) { if (container.state.isRunning()) { context.log(logger, "Stopping container"); - docker.stopContainer(context.containerName()); + containerEngine.stopContainer(context.containerName()); } context.log(logger, "Deleting container"); - docker.deleteContainer(context.containerName()); + containerEngine.deleteContainer(context.containerName()); } @Override public void updateContainer(NodeAgentContext context, ContainerResources containerResources) { - docker.updateContainer(context.containerName(), containerResources); + containerEngine.updateContainer(context.containerName(), containerResources); } @Override public Optional<Container> getContainer(NodeAgentContext context) { - return docker.getContainer(context.containerName()); + return containerEngine.getContainer(context.containerName()); } @Override - public boolean pullImageAsyncIfNeeded(DockerImage dockerImage) { - return docker.pullImageAsyncIfNeeded(dockerImage); + public boolean pullImageAsyncIfNeeded(ContainerImage containerImage) { + return containerEngine.pullImageAsyncIfNeeded(containerImage); } @Override public ProcessResult executeCommandInContainerAsRoot(NodeAgentContext context, Long timeoutSeconds, String... command) { - return docker.executeInContainerAsUser(context.containerName(), "root", OptionalLong.of(timeoutSeconds), command); + return containerEngine.executeInContainerAsUser(context.containerName(), "root", OptionalLong.of(timeoutSeconds), command); } @Override public ProcessResult executeCommandInContainerAsRoot(NodeAgentContext context, String... command) { - return docker.executeInContainerAsUser(context.containerName(), "root", OptionalLong.empty(), command); + return containerEngine.executeInContainerAsUser(context.containerName(), "root", OptionalLong.empty(), command); } @Override public CommandResult executeCommandInNetworkNamespace(NodeAgentContext context, String... command) { - int containerPid = docker.getContainer(context.containerName()) + int containerPid = containerEngine.getContainer(context.containerName()) .filter(container -> container.state.isRunning()) .orElseThrow(() -> new RuntimeException( "Found no running container named " + context.containerName().asString())) @@ -276,10 +276,10 @@ public class DockerOperationsImpl implements DockerOperations { @Override public Optional<ContainerStats> getContainerStats(NodeAgentContext context) { - return docker.getContainerStats(context.containerName()); + return containerEngine.getContainerStats(context.containerName()); } - private void addMounts(NodeAgentContext context, Docker.CreateContainerCommand command) { + private void addMounts(NodeAgentContext context, ContainerEngine.CreateContainerCommand command) { var volumes = new VolumeHelper(context, command); // Paths unique to each container @@ -320,12 +320,12 @@ public class DockerOperationsImpl implements DockerOperations { @Override public boolean noManagedContainersRunning() { - return docker.noManagedContainersRunning(MANAGER_NAME); + return containerEngine.noManagedContainersRunning(MANAGER_NAME); } @Override - public boolean deleteUnusedDockerImages(List<DockerImage> excludes, Duration minImageAgeToDelete) { - return docker.deleteUnusedDockerImages(excludes, minImageAgeToDelete); + public boolean deleteUnusedContainerImages(List<ContainerImage> excludes, Duration minImageAgeToDelete) { + return containerEngine.deleteUnusedContainerImages(excludes, minImageAgeToDelete); } /** Returns whether given nodeType is a Docker host for infrastructure nodes */ @@ -337,9 +337,9 @@ public class DockerOperationsImpl implements DockerOperations { private static class VolumeHelper { private final NodeAgentContext context; - private final Docker.CreateContainerCommand command; + private final ContainerEngine.CreateContainerCommand command; - public VolumeHelper(NodeAgentContext context, Docker.CreateContainerCommand command) { + public VolumeHelper(NodeAgentContext context, ContainerEngine.CreateContainerCommand command) { this.context = context; this.command = command; } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index a5efec1dcb7..836c8e5fc36 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.node.admin.maintenance; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.hosted.dockerapi.Container; import com.yahoo.vespa.hosted.dockerapi.ContainerName; @@ -208,7 +208,7 @@ public class StorageMaintainer { private String getDockerImage(NodeAgentContext context, Optional<Container> container) { return container.map(c -> c.image.asString()) .orElse(context.node().currentDockerImage() - .map(DockerImage::asString) + .map(ContainerImage::asString) .orElse("<none>") ); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java index fe6b29402b5..70253826772 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.hosted.node.admin.maintenance.acl; import com.google.common.net.InetAddresses; -import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations; +import com.yahoo.vespa.hosted.node.admin.docker.ContainerOperations; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentTask; import com.yahoo.vespa.hosted.node.admin.task.util.file.Editor; @@ -41,11 +41,11 @@ import static com.yahoo.yolean.Exceptions.uncheck; public class AclMaintainer { private static final Logger logger = Logger.getLogger(AclMaintainer.class.getName()); - private final DockerOperations dockerOperations; + private final ContainerOperations containerOperations; private final IPAddresses ipAddresses; - public AclMaintainer(DockerOperations dockerOperations, IPAddresses ipAddresses) { - this.dockerOperations = dockerOperations; + public AclMaintainer(ContainerOperations containerOperations, IPAddresses ipAddresses) { + this.containerOperations = containerOperations; this.ipAddresses = ipAddresses; } @@ -88,7 +88,7 @@ public class AclMaintainer { } private Supplier<List<String>> listTable(NodeAgentContext context, String table, IPVersion ipVersion) { - return () -> dockerOperations + return () -> containerOperations .executeCommandInNetworkNamespace(context, ipVersion.iptablesCmd(), "-S", "-t", table) .mapEachLine(String::trim); } @@ -99,12 +99,12 @@ public class AclMaintainer { String rules = String.join("\n", list); String fileContent = "*" + table + "\n" + rules + "\nCOMMIT\n"; fileHandler.writeUtf8Content(fileContent); - dockerOperations.executeCommandInNetworkNamespace(context, ipVersion.iptablesRestore(), fileHandler.absolutePath()); + containerOperations.executeCommandInNetworkNamespace(context, ipVersion.iptablesRestore(), fileHandler.absolutePath()); } catch (Exception e) { if (flush) { context.log(logger, Level.SEVERE, "Exception occurred while syncing iptable " + table + ", attempting rollback", e); try { - dockerOperations.executeCommandInNetworkNamespace(context, ipVersion.iptablesCmd(), "-F", "-t", table); + containerOperations.executeCommandInNetworkNamespace(context, ipVersion.iptablesCmd(), "-F", "-t", table); } catch (Exception ne) { context.log(logger, Level.SEVERE, "Rollback of table " + table + " failed, giving up", ne); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java index bee9f864ab0..63bfe87b662 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.hosted.node.admin.maintenance.coredump; import com.yahoo.vespa.hosted.dockerapi.ProcessResult; -import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations; +import com.yahoo.vespa.hosted.node.admin.docker.ContainerOperations; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext; import java.nio.file.Path; @@ -28,9 +28,9 @@ public class CoreCollector { private static final Pattern EXECFN_PATH_PATTERN = Pattern.compile("^.* execfn: '(?<path>.*?)'"); private static final Pattern FROM_PATH_PATTERN = Pattern.compile("^.* from '(?<path>.*?)'"); - private final DockerOperations docker; + private final ContainerOperations docker; - public CoreCollector(DockerOperations docker) { + public CoreCollector(ContainerOperations docker) { this.docker = docker; } 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 eb3bd0d6d2e..61d80339dd6 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 @@ -1,7 +1,7 @@ // 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.nodeagent; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.zone.ZoneApi; @@ -20,7 +20,7 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState; 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.docker.DockerOperations; +import com.yahoo.vespa.hosted.node.admin.docker.ContainerOperations; import com.yahoo.vespa.hosted.node.admin.maintenance.StorageMaintainer; import com.yahoo.vespa.hosted.node.admin.maintenance.acl.AclMaintainer; import com.yahoo.vespa.hosted.node.admin.maintenance.identity.CredentialsMaintainer; @@ -57,7 +57,7 @@ public class NodeAgentImpl implements NodeAgent { private final NodeAgentContextSupplier contextSupplier; private final NodeRepository nodeRepository; private final Orchestrator orchestrator; - private final DockerOperations dockerOperations; + private final ContainerOperations containerOperations; private final StorageMaintainer storageMaintainer; private final Optional<CredentialsMaintainer> credentialsMaintainer; private final Optional<AclMaintainer> aclMaintainer; @@ -97,21 +97,21 @@ public class NodeAgentImpl implements NodeAgent { // Created in NodeAdminImpl public NodeAgentImpl(NodeAgentContextSupplier contextSupplier, NodeRepository nodeRepository, - Orchestrator orchestrator, DockerOperations dockerOperations, StorageMaintainer storageMaintainer, + Orchestrator orchestrator, ContainerOperations containerOperations, StorageMaintainer storageMaintainer, FlagSource flagSource, Optional<CredentialsMaintainer> credentialsMaintainer, Optional<AclMaintainer> aclMaintainer, Optional<HealthChecker> healthChecker, Clock clock) { - this(contextSupplier, nodeRepository, orchestrator, dockerOperations, storageMaintainer, flagSource, credentialsMaintainer, + this(contextSupplier, nodeRepository, orchestrator, containerOperations, storageMaintainer, flagSource, credentialsMaintainer, aclMaintainer, healthChecker, clock, DEFAULT_WARM_UP_DURATION); } public NodeAgentImpl(NodeAgentContextSupplier contextSupplier, NodeRepository nodeRepository, - Orchestrator orchestrator, DockerOperations dockerOperations, StorageMaintainer storageMaintainer, - FlagSource flagSource, Optional<CredentialsMaintainer> credentialsMaintainer, - Optional<AclMaintainer> aclMaintainer, Optional<HealthChecker> healthChecker, Clock clock, Duration warmUpDuration) { + Orchestrator orchestrator, ContainerOperations containerOperations, StorageMaintainer storageMaintainer, + FlagSource flagSource, Optional<CredentialsMaintainer> credentialsMaintainer, + Optional<AclMaintainer> aclMaintainer, Optional<HealthChecker> healthChecker, Clock clock, Duration warmUpDuration) { this.contextSupplier = contextSupplier; this.nodeRepository = nodeRepository; this.orchestrator = orchestrator; - this.dockerOperations = dockerOperations; + this.containerOperations = containerOperations; this.storageMaintainer = storageMaintainer; this.credentialsMaintainer = credentialsMaintainer; this.aclMaintainer = aclMaintainer; @@ -157,7 +157,7 @@ public class NodeAgentImpl implements NodeAgent { void startServicesIfNeeded(NodeAgentContext context) { if (!hasStartedServices) { context.log(logger, "Starting services"); - dockerOperations.startServices(context); + containerOperations.startServices(context); hasStartedServices = true; } } @@ -165,7 +165,7 @@ public class NodeAgentImpl implements NodeAgent { void resumeNodeIfNeeded(NodeAgentContext context) { if (!hasResumedNode) { context.log(logger, Level.FINE, "Starting optional node program resume command"); - dockerOperations.resumeNode(context); + containerOperations.resumeNode(context); hasResumedNode = true; } } @@ -185,10 +185,10 @@ public class NodeAgentImpl implements NodeAgent { newNodeAttributes.withRebootGeneration(currentRebootGeneration); } - Optional<DockerImage> actualDockerImage = context.node().wantedDockerImage().filter(n -> containerState == UNKNOWN); + Optional<ContainerImage> actualDockerImage = context.node().wantedDockerImage().filter(n -> containerState == UNKNOWN); if (!Objects.equals(context.node().currentDockerImage(), actualDockerImage)) { - DockerImage currentImage = context.node().currentDockerImage().orElse(DockerImage.EMPTY); - DockerImage newImage = actualDockerImage.orElse(DockerImage.EMPTY); + ContainerImage currentImage = context.node().currentDockerImage().orElse(ContainerImage.EMPTY); + ContainerImage newImage = actualDockerImage.orElse(ContainerImage.EMPTY); currentNodeAttributes.withDockerImage(currentImage); currentNodeAttributes.withVespaVersion(currentImage.tagAsVersion()); @@ -211,15 +211,15 @@ public class NodeAgentImpl implements NodeAgent { ContainerData containerData = createContainerData(context); ContainerResources wantedResources = context.nodeType() != NodeType.tenant || warmUpDuration(context.zone()).isNegative() ? getContainerResources(context) : getContainerResources(context).withUnlimitedCpus(); - dockerOperations.createContainer(context, containerData, wantedResources); - dockerOperations.startContainer(context); + containerOperations.createContainer(context, containerData, wantedResources); + containerOperations.startContainer(context); currentRebootGeneration = context.node().wantedRebootGeneration(); currentRestartGeneration = context.node().wantedRestartGeneration(); hasStartedServices = true; // Automatically started with the container hasResumedNode = false; context.log(logger, "Container successfully started, new containerState is " + containerState); - return dockerOperations.getContainer(context).orElseThrow(() -> + return containerOperations.getContainer(context).orElseThrow(() -> new ConvergenceException("Did not find container that was just started")); } @@ -236,7 +236,7 @@ public class NodeAgentImpl implements NodeAgent { context.log(logger, "Will restart services: " + restartReason); orchestratorSuspendNode(context); - dockerOperations.restartVespa(context); + containerOperations.restartVespa(context); currentRestartGeneration = context.node().wantedRestartGeneration(); }); } @@ -268,7 +268,7 @@ public class NodeAgentImpl implements NodeAgent { try { hasStartedServices = hasResumedNode = false; firstSuccessfulHealthCheckInstant = Optional.empty(); - dockerOperations.stopServices(context); + containerOperations.stopServices(context); } catch (ContainerNotFoundException e) { containerState = ABSENT; } @@ -284,7 +284,7 @@ public class NodeAgentImpl implements NodeAgent { if (containerState == ABSENT) return; try { hasResumedNode = false; - dockerOperations.suspendNode(context); + containerOperations.suspendNode(context); } catch (ContainerNotFoundException e) { containerState = ABSENT; } catch (RuntimeException e) { @@ -345,7 +345,7 @@ public class NodeAgentImpl implements NodeAgent { } storageMaintainer.handleCoreDumpsForContainer(context, Optional.of(existingContainer)); - dockerOperations.removeContainer(context, existingContainer); + containerOperations.removeContainer(context, existingContainer); containerState = ABSENT; context.log(logger, "Container successfully removed, new containerState is " + containerState); } @@ -366,8 +366,8 @@ public class NodeAgentImpl implements NodeAgent { orchestratorSuspendNode(context); // Only update CPU resources - dockerOperations.updateContainer(context, wantedContainerResources.withMemoryBytes(existingContainer.resources.memoryBytes())); - return dockerOperations.getContainer(context).orElseThrow(() -> + containerOperations.updateContainer(context, wantedContainerResources.withMemoryBytes(existingContainer.resources.memoryBytes())); + return containerOperations.getContainer(context).orElseThrow(() -> new ConvergenceException("Did not find container that was just updated")); } @@ -390,7 +390,7 @@ public class NodeAgentImpl implements NodeAgent { private boolean downloadImageIfNeeded(NodeSpec node, Optional<Container> container) { if (node.wantedDockerImage().equals(container.map(c -> c.image))) return false; - return node.wantedDockerImage().map(dockerOperations::pullImageAsyncIfNeeded).orElse(false); + return node.wantedDockerImage().map(containerOperations::pullImageAsyncIfNeeded).orElse(false); } public void converge(NodeAgentContext context) { @@ -531,7 +531,7 @@ public class NodeAgentImpl implements NodeAgent { private Optional<Container> getContainer(NodeAgentContext context) { if (containerState == ABSENT) return Optional.empty(); - Optional<Container> container = dockerOperations.getContainer(context); + Optional<Container> container = containerOperations.getContainer(context); if (container.isEmpty()) containerState = ABSENT; return container; } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java index 2e40596bcf0..e39161f828a 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.node.admin.configserver.noderepository; import com.yahoo.application.Networking; import com.yahoo.application.container.JDisc; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.host.FlavorOverrides; @@ -106,7 +106,7 @@ public class RealNodeRepositoryTest { assertThat(containersToRun.size(), is(1)); NodeSpec node = containersToRun.get(0); assertThat(node.hostname(), is("host4.yahoo.com")); - assertThat(node.wantedDockerImage().get(), is(DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa:6.42.0"))); + assertThat(node.wantedDockerImage().get(), is(ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa:6.42.0"))); assertThat(node.state(), is(NodeState.active)); assertThat(node.wantedRestartGeneration().get(), is(0L)); assertThat(node.currentRestartGeneration().get(), is(0L)); @@ -137,7 +137,7 @@ public class RealNodeRepositoryTest { hostname, new NodeAttributes() .withRestartGeneration(1) - .withDockerImage(DockerImage.fromString("image-1:6.2.3"))); + .withDockerImage(ContainerImage.fromString("image-1:6.2.3"))); } @Test diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImplTest.java index bacebcc42c0..4aa59c63662 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImplTest.java @@ -2,10 +2,10 @@ package com.yahoo.vespa.hosted.node.admin.docker; import com.google.common.net.InetAddresses; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.Container; +import com.yahoo.vespa.hosted.dockerapi.ContainerEngine; import com.yahoo.vespa.hosted.dockerapi.ContainerName; -import com.yahoo.vespa.hosted.dockerapi.Docker; import com.yahoo.vespa.hosted.dockerapi.ProcessResult; import com.yahoo.vespa.hosted.node.admin.nodeagent.ContainerData; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext; @@ -32,26 +32,26 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class DockerOperationsImplTest { - private final Docker docker = mock(Docker.class); +public class ContainerOperationsImplTest { + private final ContainerEngine containerEngine = mock(ContainerEngine.class); private final TestTerminal terminal = new TestTerminal(); private final IPAddresses ipAddresses = new IPAddressesMock(); private final FileSystem fileSystem = TestFileSystem.create(); - private final DockerOperationsImpl dockerOperations = new DockerOperationsImpl( - docker, terminal, ipAddresses, fileSystem); + private final ContainerOperationsImpl dockerOperations = new ContainerOperationsImpl( + containerEngine, terminal, ipAddresses, fileSystem); @Test public void processResultFromNodeProgramWhenSuccess() { final NodeAgentContext context = new NodeAgentContextImpl.Builder("container-123.domain.tld").build(); final ProcessResult actualResult = new ProcessResult(0, "output", "errors"); - when(docker.executeInContainerAsUser(any(), any(), any(), any())) + when(containerEngine.executeInContainerAsUser(any(), any(), any(), any())) .thenReturn(actualResult); // output from node program ProcessResult result = dockerOperations.executeNodeCtlInContainer(context, "start"); - final InOrder inOrder = inOrder(docker); - inOrder.verify(docker, times(1)).executeInContainerAsUser( + final InOrder inOrder = inOrder(containerEngine); + inOrder.verify(containerEngine, times(1)).executeInContainerAsUser( eq(context.containerName()), eq("root"), eq(OptionalLong.empty()), @@ -66,7 +66,7 @@ public class DockerOperationsImplTest { final NodeAgentContext context = new NodeAgentContextImpl.Builder("container-123.domain.tld").build(); final ProcessResult actualResult = new ProcessResult(3, "output", "errors"); - when(docker.executeInContainerAsUser(any(), any(), any(), any())) + when(containerEngine.executeInContainerAsUser(any(), any(), any(), any())) .thenReturn(actualResult); // output from node program dockerOperations.executeNodeCtlInContainer(context, "start"); @@ -83,9 +83,9 @@ public class DockerOperationsImplTest { } private Container makeContainer(String name, Container.State state, int pid) { - final Container container = new Container(name + ".fqdn", DockerImage.fromString("mock"), null, + final Container container = new Container(name + ".fqdn", ContainerImage.fromString("mock"), null, new ContainerName(name), state, pid); - when(docker.getContainer(eq(container.name))).thenReturn(Optional.of(container)); + when(containerEngine.getContainer(eq(container.name))).thenReturn(Optional.of(container)); return container; } @@ -100,7 +100,7 @@ public class DockerOperationsImplTest { verify(containerData, times(1)).addFile( fileSystem.getPath("/etc/hosts"), - "# This file was generated by com.yahoo.vespa.hosted.node.admin.docker.DockerOperationsImpl\n" + + "# This file was generated by com.yahoo.vespa.hosted.node.admin.docker.ContainerOperationsImpl\n" + "127.0.0.1 localhost\n" + "::1 localhost ip6-localhost ip6-loopback\n" + "fe00::0 ip6-localnet\n" + @@ -113,7 +113,7 @@ public class DockerOperationsImplTest { verify(containerData, times(1)).addFile( fileSystem.getPath("/etc/hosts"), - "# This file was generated by com.yahoo.vespa.hosted.node.admin.docker.DockerOperationsImpl\n" + + "# This file was generated by com.yahoo.vespa.hosted.node.admin.docker.ContainerOperationsImpl\n" + "127.0.0.1 localhost\n" + "::1 localhost ip6-localhost ip6-loopback\n" + "fe00::0 ip6-localnet\n" + diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java index 0ed52cae5b8..50435ccf46d 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java @@ -1,7 +1,7 @@ // 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.integrationTests; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.ContainerName; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; import org.junit.Test; @@ -19,24 +19,24 @@ public class DockerFailTest { @Test public void dockerFailTest() { try (DockerTester tester = new DockerTester()) { - final DockerImage dockerImage = DockerImage.fromString("dockerImage"); + final ContainerImage containerImage = ContainerImage.fromString("containerImage"); final ContainerName containerName = new ContainerName("host1"); final String hostname = "host1.test.yahoo.com"; tester.addChildNodeRepositoryNode(NodeSpec.Builder .testSpec(hostname) - .wantedDockerImage(dockerImage) - .currentDockerImage(dockerImage) + .wantedDockerImage(containerImage) + .currentDockerImage(containerImage) .build()); - tester.inOrder(tester.docker).createContainerCommand(eq(dockerImage), eq(containerName)); - tester.inOrder(tester.docker).executeInContainerAsUser( + tester.inOrder(tester.containerEngine).createContainerCommand(eq(containerImage), eq(containerName)); + tester.inOrder(tester.containerEngine).executeInContainerAsUser( eq(containerName), eq("root"), any(), eq(DockerTester.NODE_PROGRAM), eq("resume")); - tester.docker.deleteContainer(new ContainerName("host1")); + tester.containerEngine.deleteContainer(new ContainerName("host1")); - tester.inOrder(tester.docker).deleteContainer(eq(containerName)); - tester.inOrder(tester.docker).createContainerCommand(eq(dockerImage), eq(containerName)); - tester.inOrder(tester.docker).executeInContainerAsUser( + tester.inOrder(tester.containerEngine).deleteContainer(eq(containerName)); + tester.inOrder(tester.containerEngine).createContainerCommand(eq(containerImage), eq(containerName)); + tester.inOrder(tester.containerEngine).executeInContainerAsUser( eq(containerName), eq("root"), any(), eq(DockerTester.NODE_PROGRAM), eq("resume")); verify(tester.nodeRepository, never()).updateNodeAttributes(any(), any()); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java index 1484e40afe9..000d0e69550 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java @@ -1,12 +1,12 @@ // 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.integrationTests; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.Container; +import com.yahoo.vespa.hosted.dockerapi.ContainerEngine; import com.yahoo.vespa.hosted.dockerapi.ContainerName; import com.yahoo.vespa.hosted.dockerapi.ContainerResources; import com.yahoo.vespa.hosted.dockerapi.ContainerStats; -import com.yahoo.vespa.hosted.dockerapi.Docker; import com.yahoo.vespa.hosted.dockerapi.ProcessResult; import java.net.InetAddress; @@ -23,13 +23,13 @@ import java.util.OptionalLong; * * @author freva */ -public class DockerMock implements Docker { +public class DockerMock implements ContainerEngine { private final Map<ContainerName, Container> containersByContainerName = new HashMap<>(); private static final Object monitor = new Object(); @Override - public CreateContainerCommand createContainerCommand(DockerImage dockerImage, ContainerName containerName) { - return new StartContainerCommandMock(dockerImage, containerName); + public CreateContainerCommand createContainerCommand(ContainerImage containerImage, ContainerName containerName) { + return new StartContainerCommandMock(containerImage, containerName); } @Override @@ -75,14 +75,14 @@ public class DockerMock implements Docker { } @Override - public boolean pullImageAsyncIfNeeded(DockerImage image) { + public boolean pullImageAsyncIfNeeded(ContainerImage image) { synchronized (monitor) { return false; } } @Override - public boolean deleteUnusedDockerImages(List<DockerImage> excludes, Duration minImageAgeToDelete) { + public boolean deleteUnusedContainerImages(List<ContainerImage> excludes, Duration minImageAgeToDelete) { return false; } @@ -98,13 +98,13 @@ public class DockerMock implements Docker { public class StartContainerCommandMock implements CreateContainerCommand { - private final DockerImage dockerImage; + private final ContainerImage containerImage; private final ContainerName containerName; private String hostName; private ContainerResources containerResources; - public StartContainerCommandMock(DockerImage dockerImage, ContainerName containerName) { - this.dockerImage = dockerImage; + public StartContainerCommandMock(ContainerImage containerImage, ContainerName containerName) { + this.containerImage = containerImage; this.containerName = containerName; } @@ -194,7 +194,7 @@ public class DockerMock implements Docker { public void create() { synchronized (monitor) { containersByContainerName.put( - containerName, new Container(hostName, dockerImage, containerResources, containerName, Container.State.RUNNING, 2)); + containerName, new Container(hostName, containerImage, containerResources, containerName, Container.State.RUNNING, 2)); } } } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java index bf14ac2ce5e..da6f115463c 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java @@ -4,12 +4,12 @@ package com.yahoo.vespa.hosted.node.admin.integrationTests; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.flags.InMemoryFlagSource; -import com.yahoo.vespa.hosted.dockerapi.Docker; +import com.yahoo.vespa.hosted.dockerapi.ContainerEngine; import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator; -import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations; -import com.yahoo.vespa.hosted.node.admin.docker.DockerOperationsImpl; +import com.yahoo.vespa.hosted.node.admin.docker.ContainerOperations; +import com.yahoo.vespa.hosted.node.admin.docker.ContainerOperationsImpl; import com.yahoo.vespa.hosted.node.admin.maintenance.StorageMaintainer; import com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminImpl; import com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminStateUpdater; @@ -51,11 +51,11 @@ public class DockerTester implements AutoCloseable { private final Thread loopThread; - final Docker docker = spy(new DockerMock()); + final ContainerEngine containerEngine = spy(new DockerMock()); final NodeRepoMock nodeRepository = spy(new NodeRepoMock()); final Orchestrator orchestrator = mock(Orchestrator.class); final StorageMaintainer storageMaintainer = mock(StorageMaintainer.class); - final InOrder inOrder = Mockito.inOrder(docker, nodeRepository, orchestrator, storageMaintainer); + final InOrder inOrder = Mockito.inOrder(containerEngine, nodeRepository, orchestrator, storageMaintainer); final InMemoryFlagSource flagSource = new InMemoryFlagSource(); final NodeAdminStateUpdater nodeAdminStateUpdater; @@ -81,10 +81,10 @@ public class DockerTester implements AutoCloseable { Clock clock = Clock.systemUTC(); Metrics metrics = new Metrics(); FileSystem fileSystem = TestFileSystem.create(); - DockerOperations dockerOperations = new DockerOperationsImpl(docker, terminal, ipAddresses, fileSystem); + ContainerOperations containerOperations = new ContainerOperationsImpl(containerEngine, terminal, ipAddresses, fileSystem); NodeAgentFactory nodeAgentFactory = (contextSupplier, nodeContext) -> new NodeAgentImpl( - contextSupplier, nodeRepository, orchestrator, dockerOperations, storageMaintainer, flagSource, + contextSupplier, nodeRepository, orchestrator, containerOperations, storageMaintainer, flagSource, Optional.empty(), Optional.empty(), Optional.empty(), clock, Duration.ofSeconds(-1)); nodeAdmin = new NodeAdminImpl(nodeAgentFactory, metrics, clock, Duration.ofMillis(10), Duration.ZERO); NodeAgentContextFactory nodeAgentContextFactory = (nodeSpec, acl) -> diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java index e5156e68810..1c2bd86a00e 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java @@ -1,7 +1,7 @@ // 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.integrationTests; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.ContainerName; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttributes; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; @@ -20,31 +20,31 @@ public class MultiDockerTest { @Test public void test() { try (DockerTester tester = new DockerTester()) { - addAndWaitForNode(tester, "host1.test.yahoo.com", DockerImage.fromString("image1")); + addAndWaitForNode(tester, "host1.test.yahoo.com", ContainerImage.fromString("image1")); NodeSpec nodeSpec2 = addAndWaitForNode( - tester, "host2.test.yahoo.com", DockerImage.fromString("image2")); + tester, "host2.test.yahoo.com", ContainerImage.fromString("image2")); tester.addChildNodeRepositoryNode(NodeSpec.Builder.testSpec(nodeSpec2.hostname(), NodeState.dirty).build()); - tester.inOrder(tester.docker).deleteContainer(eq(new ContainerName("host2"))); + tester.inOrder(tester.containerEngine).deleteContainer(eq(new ContainerName("host2"))); tester.inOrder(tester.storageMaintainer).archiveNodeStorage( argThat(context -> context.containerName().equals(new ContainerName("host2")))); tester.inOrder(tester.nodeRepository).setNodeState(eq(nodeSpec2.hostname()), eq(NodeState.ready)); - addAndWaitForNode(tester, "host3.test.yahoo.com", DockerImage.fromString("image1")); + addAndWaitForNode(tester, "host3.test.yahoo.com", ContainerImage.fromString("image1")); } } - private NodeSpec addAndWaitForNode(DockerTester tester, String hostName, DockerImage dockerImage) { - NodeSpec nodeSpec = NodeSpec.Builder.testSpec(hostName).wantedDockerImage(dockerImage).build(); + private NodeSpec addAndWaitForNode(DockerTester tester, String hostName, ContainerImage containerImage) { + NodeSpec nodeSpec = NodeSpec.Builder.testSpec(hostName).wantedDockerImage(containerImage).build(); tester.addChildNodeRepositoryNode(nodeSpec); ContainerName containerName = ContainerName.fromHostname(hostName); - tester.inOrder(tester.docker).createContainerCommand(eq(dockerImage), eq(containerName)); - tester.inOrder(tester.docker).executeInContainerAsUser( + tester.inOrder(tester.containerEngine).createContainerCommand(eq(containerImage), eq(containerName)); + tester.inOrder(tester.containerEngine).executeInContainerAsUser( eq(containerName), eq("root"), any(), eq(DockerTester.NODE_PROGRAM), eq("resume")); tester.inOrder(tester.nodeRepository).updateNodeAttributes(eq(hostName), - eq(new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion()))); + eq(new NodeAttributes().withDockerImage(containerImage).withVespaVersion(containerImage.tagAsVersion()))); return nodeSpec; } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java index 30f23de15bf..4fb1c578fac 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java @@ -1,7 +1,7 @@ // 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.integrationTests; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.ContainerName; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; import com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminStateUpdater; @@ -23,14 +23,14 @@ import static org.mockito.ArgumentMatchers.eq; public class RebootTest { private final String hostname = "host1.test.yahoo.com"; - private final DockerImage dockerImage = DockerImage.fromString("dockerImage"); + private final ContainerImage containerImage = ContainerImage.fromString("containerImage"); @Test public void test() { try (DockerTester tester = new DockerTester()) { - tester.addChildNodeRepositoryNode(NodeSpec.Builder.testSpec(hostname).wantedDockerImage(dockerImage).build()); + tester.addChildNodeRepositoryNode(NodeSpec.Builder.testSpec(hostname).wantedDockerImage(containerImage).build()); - tester.inOrder(tester.docker).createContainerCommand(eq(dockerImage), eq(new ContainerName("host1"))); + tester.inOrder(tester.containerEngine).createContainerCommand(eq(containerImage), eq(new ContainerName("host1"))); try { tester.setWantedState(NodeAdminStateUpdater.State.SUSPENDED); @@ -38,7 +38,7 @@ public class RebootTest { tester.inOrder(tester.orchestrator).suspend( eq(HOST_HOSTNAME.value()), eq(List.of(hostname, HOST_HOSTNAME.value()))); - tester.inOrder(tester.docker).executeInContainerAsUser( + tester.inOrder(tester.containerEngine).executeInContainerAsUser( eq(new ContainerName("host1")), eq("root"), eq(OptionalLong.empty()), eq(NODE_PROGRAM), eq("stop")); assertTrue(tester.nodeAdmin.setFrozen(true)); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java index dd727d102e0..caf7945d05b 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java @@ -1,7 +1,7 @@ // 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.integrationTests; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.ContainerName; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttributes; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; @@ -22,20 +22,20 @@ public class RestartTest { public void test() { try (DockerTester tester = new DockerTester()) { String hostname = "host1.test.yahoo.com"; - DockerImage dockerImage = DockerImage.fromString("dockerImage:1.2.3"); + ContainerImage containerImage = ContainerImage.fromString("containerImage:1.2.3"); - tester.addChildNodeRepositoryNode(NodeSpec.Builder.testSpec(hostname).wantedDockerImage(dockerImage).build()); + tester.addChildNodeRepositoryNode(NodeSpec.Builder.testSpec(hostname).wantedDockerImage(containerImage).build()); - tester.inOrder(tester.docker).createContainerCommand(eq(dockerImage), eq(new ContainerName("host1"))); + tester.inOrder(tester.containerEngine).createContainerCommand(eq(containerImage), eq(new ContainerName("host1"))); tester.inOrder(tester.nodeRepository).updateNodeAttributes( - eq(hostname), eq(new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion()))); + eq(hostname), eq(new NodeAttributes().withDockerImage(containerImage).withVespaVersion(containerImage.tagAsVersion()))); // Increment wantedRestartGeneration to 2 in node-repo tester.addChildNodeRepositoryNode(new NodeSpec.Builder(tester.nodeRepository.getNode(hostname)) .wantedRestartGeneration(2).build()); tester.inOrder(tester.orchestrator).suspend(eq(hostname)); - tester.inOrder(tester.docker).executeInContainerAsUser( + tester.inOrder(tester.containerEngine).executeInContainerAsUser( eq(new ContainerName("host1")), any(), any(), eq(NODE_PROGRAM), eq("restart-vespa")); tester.inOrder(tester.nodeRepository).updateNodeAttributes( eq(hostname), eq(new NodeAttributes().withRestartGeneration(2))); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java index adecc370b85..cab99b214b3 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.hosted.node.admin.maintenance.acl; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.Acl; -import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations; +import com.yahoo.vespa.hosted.node.admin.docker.ContainerOperations; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextImpl; import com.yahoo.vespa.hosted.node.admin.task.util.file.UnixPath; @@ -35,9 +35,9 @@ public class AclMaintainerTest { private static final String EMPTY_FILTER_TABLE = "-P INPUT ACCEPT\n-P FORWARD ACCEPT\n-P OUTPUT ACCEPT\n"; private static final String EMPTY_NAT_TABLE = "-P PREROUTING ACCEPT\n-P INPUT ACCEPT\n-P OUTPUT ACCEPT\n-P POSTROUTING ACCEPT\n"; - private final DockerOperations dockerOperations = mock(DockerOperations.class); + private final ContainerOperations containerOperations = mock(ContainerOperations.class); private final IPAddressesMock ipAddresses = new IPAddressesMock(); - private final AclMaintainer aclMaintainer = new AclMaintainer(dockerOperations, ipAddresses); + private final AclMaintainer aclMaintainer = new AclMaintainer(containerOperations, ipAddresses); private final FileSystem fileSystem = TestFileSystem.create(); private final Function<Acl, NodeAgentContext> contextGenerator = @@ -63,10 +63,10 @@ public class AclMaintainerTest { aclMaintainer.converge(context); - verify(dockerOperations, times(4)).executeCommandInNetworkNamespace(eq(context), any(), eq("-S"), eq("-t"), any()); - verify(dockerOperations, times(2)).executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any()); - verify(dockerOperations, times(2)).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); - verifyNoMoreInteractions(dockerOperations); + verify(containerOperations, times(4)).executeCommandInNetworkNamespace(eq(context), any(), eq("-S"), eq("-t"), any()); + verify(containerOperations, times(2)).executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any()); + verify(containerOperations, times(2)).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); + verifyNoMoreInteractions(containerOperations); List<String> expected = List.of( // IPv4 filter table restore @@ -130,10 +130,10 @@ public class AclMaintainerTest { aclMaintainer.converge(context); - verify(dockerOperations, times(2)).executeCommandInNetworkNamespace(eq(context), any(), eq("-S"), eq("-t"), any()); - verify(dockerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any()); - verify(dockerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); - verifyNoMoreInteractions(dockerOperations); + verify(containerOperations, times(2)).executeCommandInNetworkNamespace(eq(context), any(), eq("-S"), eq("-t"), any()); + verify(containerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any()); + verify(containerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); + verifyNoMoreInteractions(containerOperations); List<String> expected = List.of( // IPv4 filter table restore @@ -187,10 +187,10 @@ public class AclMaintainerTest { aclMaintainer.converge(context); - verify(dockerOperations, times(3)).executeCommandInNetworkNamespace(eq(context), any(), eq("-S"), eq("-t"), any()); - verify(dockerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any()); - verify(dockerOperations, never()).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); //we don't have a ip4 address for the container so no redirect - verifyNoMoreInteractions(dockerOperations); + verify(containerOperations, times(3)).executeCommandInNetworkNamespace(eq(context), any(), eq("-S"), eq("-t"), any()); + verify(containerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any()); + verify(containerOperations, never()).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); //we don't have a ip4 address for the container so no redirect + verifyNoMoreInteractions(containerOperations); List<String> expected = List.of( "*filter\n" + @@ -231,15 +231,15 @@ public class AclMaintainerTest { "-P POSTROUTING ACCEPT\n" + "-A OUTPUT -d 2001::1/128 -j REDIRECT\n"); - when(dockerOperations.executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any())) + when(containerOperations.executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any())) .thenThrow(new RuntimeException("iptables restore failed")); aclMaintainer.converge(context); - verify(dockerOperations, times(3)).executeCommandInNetworkNamespace(eq(context), any(), eq("-S"), eq("-t"), any()); - verify(dockerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any()); - verify(dockerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("iptables"), eq("-F"), eq("-t"), eq("filter")); - verifyNoMoreInteractions(dockerOperations); + verify(containerOperations, times(3)).executeCommandInNetworkNamespace(eq(context), any(), eq("-S"), eq("-t"), any()); + verify(containerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("iptables-restore"), any()); + verify(containerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("iptables"), eq("-F"), eq("-t"), eq("filter")); + verifyNoMoreInteractions(containerOperations); aclMaintainer.converge(context); } @@ -250,11 +250,11 @@ public class AclMaintainerTest { String path = invoc.getArgument(2); writtenFileContents.add(new UnixPath(path).readUtf8File()); return new CommandResult(null, 0, ""); - }).when(dockerOperations).executeCommandInNetworkNamespace(any(), endsWith("-restore"), any()); + }).when(containerOperations).executeCommandInNetworkNamespace(any(), endsWith("-restore"), any()); } private void whenListRules(NodeAgentContext context, String table, IPVersion ipVersion, String output) { - when(dockerOperations.executeCommandInNetworkNamespace( + when(containerOperations.executeCommandInNetworkNamespace( eq(context), eq(ipVersion.iptablesCmd()), eq("-S"), eq("-t"), eq(table))) .thenReturn(new CommandResult(null, 0, output)); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java index f8d14eea996..0be68e905ca 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.hosted.node.admin.maintenance.coredump; import com.yahoo.vespa.hosted.dockerapi.ProcessResult; -import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations; +import com.yahoo.vespa.hosted.node.admin.docker.ContainerOperations; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextImpl; import org.junit.Test; @@ -23,7 +23,7 @@ import static org.mockito.Mockito.when; public class CoreCollectorTest { private final String GDB_PATH = "/opt/rh/devtoolset-9/root/bin/gdb"; private final String JDK_PATH = "/path/to/jdk/java"; - private final DockerOperations docker = mock(DockerOperations.class); + private final ContainerOperations docker = mock(ContainerOperations.class); private final CoreCollector coreCollector = new CoreCollector(docker); private final NodeAgentContext context = new NodeAgentContextImpl.Builder("container-123.domain.tld").build(); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java index dc1c0466d39..43bb73ae8d0 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.node.admin.nodeagent; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.test.ManualClock; @@ -19,7 +19,7 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState; 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.docker.DockerOperations; +import com.yahoo.vespa.hosted.node.admin.docker.ContainerOperations; import com.yahoo.vespa.hosted.node.admin.maintenance.StorageMaintainer; import com.yahoo.vespa.hosted.node.admin.maintenance.acl.AclMaintainer; import com.yahoo.vespa.hosted.node.admin.maintenance.identity.CredentialsMaintainer; @@ -55,8 +55,8 @@ public class NodeAgentImplTest { private static final String hostName = "host1.test.yahoo.com"; private final NodeAgentContextSupplier contextSupplier = mock(NodeAgentContextSupplier.class); - private final DockerImage dockerImage = DockerImage.fromString("dockerImage"); - private final DockerOperations dockerOperations = mock(DockerOperations.class); + private final ContainerImage containerImage = ContainerImage.fromString("containerImage"); + private final ContainerOperations containerOperations = mock(ContainerOperations.class); private final NodeRepository nodeRepository = mock(NodeRepository.class); private final Orchestrator orchestrator = mock(Orchestrator.class); private final StorageMaintainer storageMaintainer = mock(StorageMaintainer.class); @@ -70,37 +70,37 @@ public class NodeAgentImplTest { @Test public void upToDateContainerIsUntouched() { final NodeSpec node = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .allowedToBeDown(false) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); nodeAgent.doConverge(context); - verify(dockerOperations, never()).removeContainer(eq(context), any()); + verify(containerOperations, never()).removeContainer(eq(context), any()); verify(orchestrator, never()).suspend(any(String.class)); - verify(dockerOperations, never()).pullImageAsyncIfNeeded(any()); + verify(containerOperations, never()).pullImageAsyncIfNeeded(any()); - final InOrder inOrder = inOrder(dockerOperations, orchestrator, nodeRepository); + final InOrder inOrder = inOrder(containerOperations, orchestrator, nodeRepository); // TODO: Verify this isn't run unless 1st time - inOrder.verify(dockerOperations, never()).startServices(eq(context)); - inOrder.verify(dockerOperations, times(1)).resumeNode(eq(context)); + inOrder.verify(containerOperations, never()).startServices(eq(context)); + inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); inOrder.verify(orchestrator, never()).resume(hostName); } @Test public void verifyRemoveOldFilesIfDiskFull() { final NodeSpec node = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); nodeAgent.doConverge(context); @@ -110,42 +110,42 @@ public class NodeAgentImplTest { @Test public void startsAfterStoppingServices() { - final InOrder inOrder = inOrder(dockerOperations); + final InOrder inOrder = inOrder(containerOperations); final NodeSpec node = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); nodeAgent.doConverge(context); - inOrder.verify(dockerOperations, never()).startServices(eq(context)); - inOrder.verify(dockerOperations, times(1)).resumeNode(eq(context)); + inOrder.verify(containerOperations, never()).startServices(eq(context)); + inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); nodeAgent.stopForHostSuspension(context); nodeAgent.doConverge(context); - inOrder.verify(dockerOperations, never()).startServices(eq(context)); - inOrder.verify(dockerOperations, times(1)).resumeNode(eq(context)); // Expect a resume, but no start services + inOrder.verify(containerOperations, never()).startServices(eq(context)); + inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); // Expect a resume, but no start services // No new suspends/stops, so no need to resume/start nodeAgent.doConverge(context); - inOrder.verify(dockerOperations, never()).startServices(eq(context)); - inOrder.verify(dockerOperations, never()).resumeNode(eq(context)); + inOrder.verify(containerOperations, never()).startServices(eq(context)); + inOrder.verify(containerOperations, never()).resumeNode(eq(context)); nodeAgent.stopForHostSuspension(context); nodeAgent.doConverge(context); - inOrder.verify(dockerOperations, times(1)).createContainer(eq(context), any(), any()); - inOrder.verify(dockerOperations, times(1)).startContainer(eq(context)); - inOrder.verify(dockerOperations, times(0)).startServices(eq(context)); // done as part of startContainer - inOrder.verify(dockerOperations, times(1)).resumeNode(eq(context)); + inOrder.verify(containerOperations, times(1)).createContainer(eq(context), any(), any()); + inOrder.verify(containerOperations, times(1)).startContainer(eq(context)); + inOrder.verify(containerOperations, times(0)).startServices(eq(context)); // done as part of startContainer + inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); } @Test public void absentContainerCausesStart() { final NodeSpec node = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage) + .wantedDockerImage(containerImage) .wantedVespaVersion(vespaVersion) .build(); @@ -153,63 +153,63 @@ public class NodeAgentImplTest { NodeAgentImpl nodeAgent = makeNodeAgent(null, false); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); - when(dockerOperations.pullImageAsyncIfNeeded(eq(dockerImage))).thenReturn(false); + when(containerOperations.pullImageAsyncIfNeeded(eq(containerImage))).thenReturn(false); nodeAgent.doConverge(context); - verify(dockerOperations, never()).removeContainer(eq(context), any()); - verify(dockerOperations, never()).startServices(any()); + verify(containerOperations, never()).removeContainer(eq(context), any()); + verify(containerOperations, never()).startServices(any()); verify(orchestrator, never()).suspend(any(String.class)); - final InOrder inOrder = inOrder(dockerOperations, orchestrator, nodeRepository, aclMaintainer, healthChecker); - inOrder.verify(dockerOperations, times(1)).pullImageAsyncIfNeeded(eq(dockerImage)); - inOrder.verify(dockerOperations, times(1)).createContainer(eq(context), any(), any()); - inOrder.verify(dockerOperations, times(1)).startContainer(eq(context)); + final InOrder inOrder = inOrder(containerOperations, orchestrator, nodeRepository, aclMaintainer, healthChecker); + inOrder.verify(containerOperations, times(1)).pullImageAsyncIfNeeded(eq(containerImage)); + inOrder.verify(containerOperations, times(1)).createContainer(eq(context), any(), any()); + inOrder.verify(containerOperations, times(1)).startContainer(eq(context)); inOrder.verify(aclMaintainer, times(1)).converge(eq(context)); - inOrder.verify(dockerOperations, times(1)).resumeNode(eq(context)); + inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); inOrder.verify(healthChecker, times(1)).verifyHealth(eq(context)); inOrder.verify(nodeRepository).updateNodeAttributes( - hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion())); + hostName, new NodeAttributes().withDockerImage(containerImage).withVespaVersion(containerImage.tagAsVersion())); inOrder.verify(orchestrator, never()).resume(hostName); } @Test public void containerIsNotStoppedIfNewImageMustBePulled() { - final DockerImage newDockerImage = DockerImage.fromString("new-image"); + final ContainerImage newContainerImage = ContainerImage.fromString("new-image"); final NodeSpec node = nodeBuilder(NodeState.active) - .wantedDockerImage(newDockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(newContainerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); - when(dockerOperations.pullImageAsyncIfNeeded(any())).thenReturn(true); + when(containerOperations.pullImageAsyncIfNeeded(any())).thenReturn(true); nodeAgent.doConverge(context); verify(orchestrator, never()).suspend(any(String.class)); verify(orchestrator, never()).resume(any(String.class)); - verify(dockerOperations, never()).removeContainer(eq(context), any()); + verify(containerOperations, never()).removeContainer(eq(context), any()); - final InOrder inOrder = inOrder(dockerOperations); - inOrder.verify(dockerOperations, times(1)).pullImageAsyncIfNeeded(eq(newDockerImage)); + final InOrder inOrder = inOrder(containerOperations); + inOrder.verify(containerOperations, times(1)).pullImageAsyncIfNeeded(eq(newContainerImage)); } @Test public void containerIsUpdatedIfCpuChanged() { NodeSpec.Builder specBuilder = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .allowedToBeDown(false); NodeAgentContext firstContext = createContext(specBuilder.build()); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); - when(dockerOperations.pullImageAsyncIfNeeded(any())).thenReturn(true); + when(containerOperations.pullImageAsyncIfNeeded(any())).thenReturn(true); - InOrder inOrder = inOrder(orchestrator, dockerOperations); + InOrder inOrder = inOrder(orchestrator, containerOperations); nodeAgent.doConverge(firstContext); inOrder.verify(orchestrator, never()).resume(any(String.class)); @@ -221,70 +221,70 @@ public class NodeAgentImplTest { NodeAgentContext thirdContext = new NodeAgentContextImpl.Builder(specBuilder.vcpu(5).build()).cpuSpeedUp(1.25).build(); nodeAgent.doConverge(thirdContext); ContainerResources resourcesAfterThird = ContainerResources.from(0, 4, 16); - mockGetContainer(dockerImage, resourcesAfterThird, true); + mockGetContainer(containerImage, resourcesAfterThird, true); inOrder.verify(orchestrator).suspend(any(String.class)); - inOrder.verify(dockerOperations).updateContainer(eq(thirdContext), eq(resourcesAfterThird)); - inOrder.verify(dockerOperations, never()).removeContainer(any(), any()); - inOrder.verify(dockerOperations, never()).startContainer(any()); + inOrder.verify(containerOperations).updateContainer(eq(thirdContext), eq(resourcesAfterThird)); + inOrder.verify(containerOperations, never()).removeContainer(any(), any()); + inOrder.verify(containerOperations, never()).startContainer(any()); inOrder.verify(orchestrator).resume(any(String.class)); // No changes nodeAgent.converge(thirdContext); inOrder.verify(orchestrator, never()).suspend(any(String.class)); - inOrder.verify(dockerOperations, never()).updateContainer(eq(thirdContext), any()); - inOrder.verify(dockerOperations, never()).removeContainer(any(), any()); + inOrder.verify(containerOperations, never()).updateContainer(eq(thirdContext), any()); + inOrder.verify(containerOperations, never()).removeContainer(any(), any()); inOrder.verify(orchestrator, never()).resume(any(String.class)); // Set the feature flag flagSource.withDoubleFlag(Flags.CONTAINER_CPU_CAP.id(), 2.3); nodeAgent.doConverge(thirdContext); - inOrder.verify(dockerOperations).updateContainer(eq(thirdContext), eq(ContainerResources.from(9.2, 4, 16))); + inOrder.verify(containerOperations).updateContainer(eq(thirdContext), eq(ContainerResources.from(9.2, 4, 16))); inOrder.verify(orchestrator).resume(any(String.class)); } @Test public void containerIsRecreatedIfMemoryChanged() { NodeSpec.Builder specBuilder = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .wantedRestartGeneration(2).currentRestartGeneration(1); NodeAgentContext firstContext = createContext(specBuilder.build()); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); - when(dockerOperations.pullImageAsyncIfNeeded(any())).thenReturn(true); + when(containerOperations.pullImageAsyncIfNeeded(any())).thenReturn(true); nodeAgent.doConverge(firstContext); NodeAgentContext secondContext = createContext(specBuilder.memoryGb(20).build()); nodeAgent.doConverge(secondContext); ContainerResources resourcesAfterThird = ContainerResources.from(0, 2, 20); - mockGetContainer(dockerImage, resourcesAfterThird, true); + mockGetContainer(containerImage, resourcesAfterThird, true); - InOrder inOrder = inOrder(orchestrator, dockerOperations, nodeRepository); + InOrder inOrder = inOrder(orchestrator, containerOperations, nodeRepository); inOrder.verify(orchestrator).resume(any(String.class)); - inOrder.verify(dockerOperations).removeContainer(eq(secondContext), any()); - inOrder.verify(dockerOperations, never()).updateContainer(any(), any()); - inOrder.verify(dockerOperations, never()).restartVespa(any()); + inOrder.verify(containerOperations).removeContainer(eq(secondContext), any()); + inOrder.verify(containerOperations, never()).updateContainer(any(), any()); + inOrder.verify(containerOperations, never()).restartVespa(any()); inOrder.verify(nodeRepository).updateNodeAttributes(eq(hostName), eq(new NodeAttributes().withRestartGeneration(2))); nodeAgent.doConverge(secondContext); inOrder.verify(orchestrator).resume(any(String.class)); - inOrder.verify(dockerOperations, never()).updateContainer(any(), any()); - inOrder.verify(dockerOperations, never()).removeContainer(any(), any()); + inOrder.verify(containerOperations, never()).updateContainer(any(), any()); + inOrder.verify(containerOperations, never()).removeContainer(any(), any()); } @Test public void noRestartIfOrchestratorSuspendFails() { final NodeSpec node = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .wantedRestartGeneration(2).currentRestartGeneration(1) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); doThrow(new OrchestratorException("Denied")).when(orchestrator).suspend(eq(hostName)); try { @@ -292,8 +292,8 @@ public class NodeAgentImplTest { fail("Expected to throw an exception"); } catch (OrchestratorException ignored) { } - verify(dockerOperations, never()).createContainer(eq(context), any(), any()); - verify(dockerOperations, never()).startContainer(eq(context)); + verify(containerOperations, never()).createContainer(eq(context), any(), any()); + verify(containerOperations, never()).startContainer(eq(context)); verify(orchestrator, never()).resume(any(String.class)); verify(nodeRepository, never()).updateNodeAttributes(any(String.class), any(NodeAttributes.class)); @@ -305,16 +305,16 @@ public class NodeAgentImplTest { public void recreatesContainerIfRebootWanted() { final long wantedRebootGeneration = 2; final NodeSpec node = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .wantedRebootGeneration(wantedRebootGeneration).currentRebootGeneration(1) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); - when(dockerOperations.pullImageAsyncIfNeeded(eq(dockerImage))).thenReturn(false); + when(containerOperations.pullImageAsyncIfNeeded(eq(containerImage))).thenReturn(false); doThrow(new ConvergenceException("Connection refused")).doNothing() .when(healthChecker).verifyHealth(eq(context)); @@ -324,17 +324,17 @@ public class NodeAgentImplTest { // First time we fail to resume because health verification fails verify(orchestrator, times(1)).suspend(eq(hostName)); - verify(dockerOperations, times(1)).removeContainer(eq(context), any()); - verify(dockerOperations, times(1)).createContainer(eq(context), any(), any()); - verify(dockerOperations, times(1)).startContainer(eq(context)); + verify(containerOperations, times(1)).removeContainer(eq(context), any()); + verify(containerOperations, times(1)).createContainer(eq(context), any(), any()); + verify(containerOperations, times(1)).startContainer(eq(context)); verify(orchestrator, never()).resume(eq(hostName)); verify(nodeRepository, never()).updateNodeAttributes(any(), any()); nodeAgent.doConverge(context); // Do not reboot the container again - verify(dockerOperations, times(1)).removeContainer(eq(context), any()); - verify(dockerOperations, times(1)).createContainer(eq(context), any(), any()); + verify(containerOperations, times(1)).removeContainer(eq(context), any()); + verify(containerOperations, times(1)).createContainer(eq(context), any(), any()); verify(orchestrator, times(1)).resume(eq(hostName)); verify(nodeRepository, times(1)).updateNodeAttributes(eq(hostName), eq(new NodeAttributes() .withRebootGeneration(wantedRebootGeneration))); @@ -343,18 +343,18 @@ public class NodeAgentImplTest { @Test public void failedNodeRunningContainerShouldStillBeRunning() { final NodeSpec node = nodeBuilder(NodeState.failed) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); nodeAgent.doConverge(context); - verify(dockerOperations, never()).removeContainer(eq(context), any()); + verify(containerOperations, never()).removeContainer(eq(context), any()); verify(orchestrator, never()).resume(any(String.class)); verify(nodeRepository, never()).updateNodeAttributes(eq(hostName), any()); } @@ -373,10 +373,10 @@ public class NodeAgentImplTest { nodeAgent.doConverge(context); // Should only be called once, when we initialize - verify(dockerOperations, times(1)).getContainer(eq(context)); - verify(dockerOperations, never()).removeContainer(eq(context), any()); - verify(dockerOperations, never()).createContainer(eq(context), any(), any()); - verify(dockerOperations, never()).startContainer(eq(context)); + verify(containerOperations, times(1)).getContainer(eq(context)); + verify(containerOperations, never()).removeContainer(eq(context), any()); + verify(containerOperations, never()).createContainer(eq(context), any(), any()); + verify(containerOperations, never()).startContainer(eq(context)); verify(orchestrator, never()).resume(any(String.class)); verify(nodeRepository, never()).updateNodeAttributes(eq(hostName), any()); } @@ -384,19 +384,19 @@ public class NodeAgentImplTest { @Test public void inactiveNodeRunningContainerShouldStillBeRunning() { final NodeSpec node = nodeBuilder(NodeState.inactive) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); nodeAgent.doConverge(context); - final InOrder inOrder = inOrder(storageMaintainer, dockerOperations); - inOrder.verify(dockerOperations, never()).removeContainer(eq(context), any()); + final InOrder inOrder = inOrder(storageMaintainer, containerOperations); + inOrder.verify(containerOperations, never()).removeContainer(eq(context), any()); verify(orchestrator, never()).resume(any(String.class)); verify(nodeRepository, never()).updateNodeAttributes(eq(hostName), any()); @@ -405,7 +405,7 @@ public class NodeAgentImplTest { @Test public void reservedNodeDoesNotUpdateNodeRepoWithVersion() { final NodeSpec node = nodeBuilder(NodeState.reserved) - .wantedDockerImage(dockerImage) + .wantedDockerImage(containerImage) .wantedVespaVersion(vespaVersion) .build(); @@ -421,34 +421,34 @@ public class NodeAgentImplTest { private void nodeRunningContainerIsTakenDownAndCleanedAndRecycled(NodeState nodeState, Optional<Long> wantedRestartGeneration) { NodeSpec.Builder builder = nodeBuilder(nodeState) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage); + .wantedDockerImage(containerImage).currentDockerImage(containerImage); wantedRestartGeneration.ifPresent(restartGeneration -> builder .wantedRestartGeneration(restartGeneration).currentRestartGeneration(restartGeneration)); NodeSpec node = builder.build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); nodeAgent.doConverge(context); - final InOrder inOrder = inOrder(storageMaintainer, dockerOperations, nodeRepository); - inOrder.verify(dockerOperations, times(1)).stopServices(eq(context)); + final InOrder inOrder = inOrder(storageMaintainer, containerOperations, nodeRepository); + inOrder.verify(containerOperations, times(1)).stopServices(eq(context)); inOrder.verify(storageMaintainer, times(1)).handleCoreDumpsForContainer(eq(context), any()); - inOrder.verify(dockerOperations, times(1)).removeContainer(eq(context), any()); + inOrder.verify(containerOperations, times(1)).removeContainer(eq(context), any()); inOrder.verify(storageMaintainer, times(1)).archiveNodeStorage(eq(context)); inOrder.verify(nodeRepository, times(1)).setNodeState(eq(hostName), eq(NodeState.ready)); - verify(dockerOperations, never()).createContainer(eq(context), any(), any()); - verify(dockerOperations, never()).startContainer(eq(context)); - verify(dockerOperations, never()).suspendNode(eq(context)); - verify(dockerOperations, times(1)).stopServices(eq(context)); + verify(containerOperations, never()).createContainer(eq(context), any(), any()); + verify(containerOperations, never()).startContainer(eq(context)); + verify(containerOperations, never()).suspendNode(eq(context)); + verify(containerOperations, times(1)).stopServices(eq(context)); verify(orchestrator, never()).resume(any(String.class)); verify(orchestrator, never()).suspend(any(String.class)); // current Docker image and vespa version should be cleared verify(nodeRepository, times(1)).updateNodeAttributes( - eq(hostName), eq(new NodeAttributes().withDockerImage(DockerImage.EMPTY).withVespaVersion(Version.emptyVersion))); + eq(hostName), eq(new NodeAttributes().withDockerImage(ContainerImage.EMPTY).withVespaVersion(Version.emptyVersion))); } @Test @@ -464,7 +464,7 @@ public class NodeAgentImplTest { @Test public void provisionedNodeIsMarkedAsDirty() { final NodeSpec node = nodeBuilder(NodeState.provisioned) - .wantedDockerImage(dockerImage) + .wantedDockerImage(containerImage) .build(); NodeAgentContext context = createContext(node); @@ -478,40 +478,40 @@ public class NodeAgentImplTest { @Test public void testRestartDeadContainerAfterNodeAdminRestart() { final NodeSpec node = nodeBuilder(NodeState.active) - .currentDockerImage(dockerImage).wantedDockerImage(dockerImage) + .currentDockerImage(containerImage).wantedDockerImage(containerImage) .currentVespaVersion(vespaVersion) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, false); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, false); when(nodeRepository.getOptionalNode(eq(hostName))).thenReturn(Optional.of(node)); nodeAgent.doConverge(context); - verify(dockerOperations, times(1)).removeContainer(eq(context), any()); - verify(dockerOperations, times(1)).createContainer(eq(context), any(), any()); - verify(dockerOperations, times(1)).startContainer(eq(context)); + verify(containerOperations, times(1)).removeContainer(eq(context), any()); + verify(containerOperations, times(1)).createContainer(eq(context), any(), any()); + verify(containerOperations, times(1)).startContainer(eq(context)); } @Test public void resumeProgramRunsUntilSuccess() { final NodeSpec node = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .currentVespaVersion(vespaVersion) .wantedRestartGeneration(1).currentRestartGeneration(1) .allowedToBeDown(true) .build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(eq(hostName))).thenReturn(Optional.of(node)); - final InOrder inOrder = inOrder(orchestrator, dockerOperations, nodeRepository); + final InOrder inOrder = inOrder(orchestrator, containerOperations, nodeRepository); doThrow(new RuntimeException("Failed 1st time")) .doNothing() - .when(dockerOperations).resumeNode(eq(context)); + .when(containerOperations).resumeNode(eq(context)); // 1st try try { @@ -519,13 +519,13 @@ public class NodeAgentImplTest { fail("Expected to throw an exception"); } catch (RuntimeException ignored) { } - inOrder.verify(dockerOperations, times(1)).resumeNode(any()); + inOrder.verify(containerOperations, times(1)).resumeNode(any()); inOrder.verifyNoMoreInteractions(); // 2nd try nodeAgent.doConverge(context); - inOrder.verify(dockerOperations).resumeNode(any()); + inOrder.verify(containerOperations).resumeNode(any()); inOrder.verify(orchestrator).resume(hostName); inOrder.verifyNoMoreInteractions(); } @@ -533,7 +533,7 @@ public class NodeAgentImplTest { @Test public void start_container_subtask_failure_leads_to_container_restart() { final NodeSpec node = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage) + .wantedDockerImage(containerImage) .wantedVespaVersion(vespaVersion) .wantedRestartGeneration(1).currentRestartGeneration(1) .build(); @@ -541,27 +541,27 @@ public class NodeAgentImplTest { NodeAgentContext context = createContext(node); NodeAgentImpl nodeAgent = spy(makeNodeAgent(null, false)); - when(dockerOperations.pullImageAsyncIfNeeded(eq(dockerImage))).thenReturn(false); - doThrow(new DockerException("Failed to set up network")).doNothing().when(dockerOperations).startContainer(eq(context)); + when(containerOperations.pullImageAsyncIfNeeded(eq(containerImage))).thenReturn(false); + doThrow(new DockerException("Failed to set up network")).doNothing().when(containerOperations).startContainer(eq(context)); try { nodeAgent.doConverge(context); fail("Expected to get DockerException"); } catch (DockerException ignored) { } - verify(dockerOperations, never()).removeContainer(eq(context), any()); - verify(dockerOperations, times(1)).createContainer(eq(context), any(), any()); - verify(dockerOperations, times(1)).startContainer(eq(context)); + verify(containerOperations, never()).removeContainer(eq(context), any()); + verify(containerOperations, times(1)).createContainer(eq(context), any(), any()); + verify(containerOperations, times(1)).startContainer(eq(context)); verify(nodeAgent, never()).resumeNodeIfNeeded(any()); // The docker container was actually started and is running, but subsequent exec calls to set up // networking failed - mockGetContainer(dockerImage, true); + mockGetContainer(containerImage, true); nodeAgent.doConverge(context); - verify(dockerOperations, times(1)).removeContainer(eq(context), any()); - verify(dockerOperations, times(2)).createContainer(eq(context), any(), any()); - verify(dockerOperations, times(2)).startContainer(eq(context)); + verify(containerOperations, times(1)).removeContainer(eq(context), any()); + verify(containerOperations, times(2)).createContainer(eq(context), any(), any()); + verify(containerOperations, times(2)).startContainer(eq(context)); verify(nodeAgent, times(1)).resumeNodeIfNeeded(any()); } @@ -569,7 +569,7 @@ public class NodeAgentImplTest { public void testRunningConfigServer() { final NodeSpec node = nodeBuilder(NodeState.active) .type(NodeType.config) - .wantedDockerImage(dockerImage) + .wantedDockerImage(containerImage) .wantedVespaVersion(vespaVersion) .allowedToBeDown(true) .build(); @@ -578,21 +578,21 @@ public class NodeAgentImplTest { NodeAgentImpl nodeAgent = makeNodeAgent(null, false); when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); - when(dockerOperations.pullImageAsyncIfNeeded(eq(dockerImage))).thenReturn(false); + when(containerOperations.pullImageAsyncIfNeeded(eq(containerImage))).thenReturn(false); nodeAgent.doConverge(context); - verify(dockerOperations, never()).removeContainer(eq(context), any()); + verify(containerOperations, never()).removeContainer(eq(context), any()); verify(orchestrator, never()).suspend(any(String.class)); - final InOrder inOrder = inOrder(dockerOperations, orchestrator, nodeRepository, aclMaintainer); - inOrder.verify(dockerOperations, times(1)).pullImageAsyncIfNeeded(eq(dockerImage)); - inOrder.verify(dockerOperations, times(1)).createContainer(eq(context), any(), any()); - inOrder.verify(dockerOperations, times(1)).startContainer(eq(context)); + final InOrder inOrder = inOrder(containerOperations, orchestrator, nodeRepository, aclMaintainer); + inOrder.verify(containerOperations, times(1)).pullImageAsyncIfNeeded(eq(containerImage)); + inOrder.verify(containerOperations, times(1)).createContainer(eq(context), any(), any()); + inOrder.verify(containerOperations, times(1)).startContainer(eq(context)); inOrder.verify(aclMaintainer, times(1)).converge(eq(context)); - inOrder.verify(dockerOperations, times(1)).resumeNode(eq(context)); + inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); inOrder.verify(nodeRepository).updateNodeAttributes( - hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion())); + hostName, new NodeAttributes().withDockerImage(containerImage).withVespaVersion(containerImage.tagAsVersion())); inOrder.verify(orchestrator).resume(hostName); } @@ -610,13 +610,13 @@ public class NodeAgentImplTest { @Test public void initial_cpu_cap_test() { NodeSpec.Builder specBuilder = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion); NodeAgentContext context = createContext(specBuilder.build()); NodeAgentImpl nodeAgent = makeNodeAgent(null, false, Duration.ofSeconds(30)); - InOrder inOrder = inOrder(orchestrator, dockerOperations); + InOrder inOrder = inOrder(orchestrator, containerOperations); ConvergenceException healthCheckException = new ConvergenceException("Not yet up"); doThrow(healthCheckException).when(healthChecker).verifyHealth(any()); @@ -639,45 +639,45 @@ public class NodeAgentImplTest { } inOrder.verify(orchestrator, never()).resume(any()); inOrder.verify(orchestrator, never()).suspend(any()); - inOrder.verify(dockerOperations, never()).updateContainer(any(), any()); + inOrder.verify(containerOperations, never()).updateContainer(any(), any()); clock.advance(Duration.ofSeconds(31)); nodeAgent.doConverge(context); inOrder.verify(orchestrator).suspend(hostName); - inOrder.verify(dockerOperations).updateContainer(eq(context), eq(ContainerResources.from(0, 2, 16))); - inOrder.verify(dockerOperations, never()).removeContainer(any(), any()); - inOrder.verify(dockerOperations, never()).startContainer(any()); + inOrder.verify(containerOperations).updateContainer(eq(context), eq(ContainerResources.from(0, 2, 16))); + inOrder.verify(containerOperations, never()).removeContainer(any(), any()); + inOrder.verify(containerOperations, never()).startContainer(any()); inOrder.verify(orchestrator).resume(any(String.class)); // No changes nodeAgent.converge(context); inOrder.verify(orchestrator, never()).suspend(any(String.class)); - inOrder.verify(dockerOperations, never()).updateContainer(eq(context), any()); - inOrder.verify(dockerOperations, never()).removeContainer(any(), any()); + inOrder.verify(containerOperations, never()).updateContainer(eq(context), any()); + inOrder.verify(containerOperations, never()).removeContainer(any(), any()); inOrder.verify(orchestrator, never()).resume(any(String.class)); } @Test public void resumes_normally_if_container_is_already_capped_on_start() { NodeSpec.Builder specBuilder = nodeBuilder(NodeState.active) - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .wantedVespaVersion(vespaVersion).currentVespaVersion(vespaVersion) .wantedRestartGeneration(1).currentRestartGeneration(1); NodeAgentContext context = createContext(specBuilder.build()); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true, Duration.ofSeconds(30)); - mockGetContainer(dockerImage, ContainerResources.from(0, 2, 16), true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true, Duration.ofSeconds(30)); + mockGetContainer(containerImage, ContainerResources.from(0, 2, 16), true); - InOrder inOrder = inOrder(orchestrator, dockerOperations); + InOrder inOrder = inOrder(orchestrator, containerOperations); nodeAgent.doConverge(context); nodeAgent.converge(context); inOrder.verify(orchestrator, never()).suspend(any(String.class)); - inOrder.verify(dockerOperations, never()).updateContainer(eq(context), any()); - inOrder.verify(dockerOperations, never()).removeContainer(any(), any()); + inOrder.verify(containerOperations, never()).updateContainer(eq(context), any()); + inOrder.verify(containerOperations, never()).removeContainer(any(), any()); inOrder.verify(orchestrator, never()).resume(any(String.class)); } @@ -687,74 +687,74 @@ public class NodeAgentImplTest { .hostname(hostName) .type(NodeType.tenant) .flavor("docker") - .wantedDockerImage(dockerImage).currentDockerImage(dockerImage) + .wantedDockerImage(containerImage).currentDockerImage(containerImage) .state(nodeState); owner.ifPresent(nodeBuilder::owner); NodeSpec node = nodeBuilder.build(); NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); + NodeAgentImpl nodeAgent = makeNodeAgent(containerImage, true); when(nodeRepository.getOptionalNode(eq(hostName))).thenReturn(Optional.of(node)); nodeAgent.doConverge(context); - verify(dockerOperations, never()).removeContainer(eq(context), any()); + verify(containerOperations, never()).removeContainer(eq(context), any()); if (owner.isPresent()) { - verify(dockerOperations, never()).stopServices(eq(context)); + verify(containerOperations, never()).stopServices(eq(context)); } else { - verify(dockerOperations, times(1)).stopServices(eq(context)); + verify(containerOperations, times(1)).stopServices(eq(context)); nodeAgent.doConverge(context); // Should not be called more than once, have already been stopped - verify(dockerOperations, times(1)).stopServices(eq(context)); + verify(containerOperations, times(1)).stopServices(eq(context)); } } - private NodeAgentImpl makeNodeAgent(DockerImage dockerImage, boolean isRunning) { - return makeNodeAgent(dockerImage, isRunning, Duration.ofSeconds(-1)); + private NodeAgentImpl makeNodeAgent(ContainerImage containerImage, boolean isRunning) { + return makeNodeAgent(containerImage, isRunning, Duration.ofSeconds(-1)); } - private NodeAgentImpl makeNodeAgent(DockerImage dockerImage, boolean isRunning, Duration warmUpDuration) { - mockGetContainer(dockerImage, isRunning); + private NodeAgentImpl makeNodeAgent(ContainerImage containerImage, boolean isRunning, Duration warmUpDuration) { + mockGetContainer(containerImage, isRunning); doAnswer(invoc -> { NodeAgentContext context = invoc.getArgument(0, NodeAgentContext.class); ContainerResources resources = invoc.getArgument(2, ContainerResources.class); mockGetContainer(context.node().wantedDockerImage().get(), resources, true); return null; - }).when(dockerOperations).createContainer(any(), any(), any()); + }).when(containerOperations).createContainer(any(), any(), any()); doAnswer(invoc -> { NodeAgentContext context = invoc.getArgument(0, NodeAgentContext.class); ContainerResources resources = invoc.getArgument(1, ContainerResources.class); mockGetContainer(context.node().wantedDockerImage().get(), resources, true); return null; - }).when(dockerOperations).updateContainer(any(), any()); + }).when(containerOperations).updateContainer(any(), any()); - return new NodeAgentImpl(contextSupplier, nodeRepository, orchestrator, dockerOperations, + return new NodeAgentImpl(contextSupplier, nodeRepository, orchestrator, containerOperations, storageMaintainer, flagSource, Optional.of(credentialsMaintainer), Optional.of(aclMaintainer), Optional.of(healthChecker), clock, warmUpDuration); } - private void mockGetContainer(DockerImage dockerImage, boolean isRunning) { - mockGetContainer(dockerImage, ContainerResources.from(0, resources.vcpu(), resources.memoryGb()), isRunning); + private void mockGetContainer(ContainerImage containerImage, boolean isRunning) { + mockGetContainer(containerImage, ContainerResources.from(0, resources.vcpu(), resources.memoryGb()), isRunning); } - private void mockGetContainer(DockerImage dockerImage, ContainerResources containerResources, boolean isRunning) { + private void mockGetContainer(ContainerImage containerImage, ContainerResources containerResources, boolean isRunning) { doAnswer(invoc -> { NodeAgentContext context = invoc.getArgument(0); if (!hostName.equals(context.hostname().value())) throw new IllegalArgumentException(); - return dockerImage != null ? + return containerImage != null ? Optional.of(new Container( hostName, - dockerImage, + containerImage, containerResources, ContainerName.fromHostname(hostName), isRunning ? Container.State.RUNNING : Container.State.EXITED, isRunning ? 1 : 0)) : Optional.empty(); - }).when(dockerOperations).getContainer(any()); + }).when(containerOperations).getContainer(any()); } private NodeAgentContext createContext(NodeSpec nodeSpec) { |