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 | |
parent | db9105023dc06c7ca56a2914735dba663bd21d5c (diff) |
Move to container engine neutral names
80 files changed, 628 insertions, 632 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 7d0228721aa..62483cb9c5d 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -7,7 +7,7 @@ import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.Zone; @@ -37,7 +37,7 @@ public interface ModelContext { default Optional<File> appDir() { return Optional.empty();} /** The Docker image repo we want to use for images for this deployment (optional, will use default if empty) */ - default Optional<DockerImage> wantedDockerImageRepo() { return Optional.empty(); } + default Optional<ContainerImage> wantedDockerImageRepo() { return Optional.empty(); } /** The Vespa version this model is built for */ Version modelVespaVersion(); diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index c52ea1ef092..30c17c30f6e 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -23,7 +23,7 @@ import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.provision.HostsXmlProvisioner; import com.yahoo.config.model.provision.SingleNodeProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Zone; import com.yahoo.io.IOUtils; import com.yahoo.io.reader.NamedReader; @@ -78,7 +78,7 @@ public class DeployState implements ConfigDefinitionStore { private final ImportedMlModels importedModels; private final ValidationOverrides validationOverrides; private final Version wantedNodeVespaVersion; - private final Optional<DockerImage> wantedDockerImageRepo; + private final Optional<ContainerImage> wantedDockerImageRepo; private final Instant now; private final HostProvisioner provisioner; private final Provisioned provisioned; @@ -115,7 +115,7 @@ public class DeployState implements ConfigDefinitionStore { Instant now, Version wantedNodeVespaVersion, boolean accessLoggingEnabledByDefault, - Optional<DockerImage> wantedDockerImageRepo) { + Optional<ContainerImage> wantedDockerImageRepo) { this.logger = deployLogger; this.fileRegistry = fileRegistry; this.rankProfileRegistry = rankProfileRegistry; @@ -267,7 +267,7 @@ public class DeployState implements ConfigDefinitionStore { public Version getWantedNodeVespaVersion() { return wantedNodeVespaVersion; } - public Optional<DockerImage> getWantedDockerImageRepo() { return wantedDockerImageRepo; } + public Optional<ContainerImage> getWantedDockerImageRepo() { return wantedDockerImageRepo; } public Instant now() { return now; } @@ -307,7 +307,7 @@ public class DeployState implements ConfigDefinitionStore { private Instant now = Instant.now(); private Version wantedNodeVespaVersion = Vtag.currentVersion; private boolean accessLoggingEnabledByDefault = true; - private Optional<DockerImage> wantedDockerImageRepo = Optional.empty(); + private Optional<ContainerImage> wantedDockerImageRepo = Optional.empty(); public Builder applicationPackage(ApplicationPackage applicationPackage) { this.applicationPackage = applicationPackage; @@ -384,7 +384,7 @@ public class DeployState implements ConfigDefinitionStore { return this; } - public Builder wantedDockerImageRepo(Optional<DockerImage> dockerImageRepo) { + public Builder wantedDockerImageRepo(Optional<ContainerImage> dockerImageRepo) { this.wantedDockerImageRepo = dockerImageRepo; return this; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java index 8f737f02dca..ab813cea8c8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java @@ -9,7 +9,7 @@ import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeResources; import com.yahoo.text.XML; import com.yahoo.vespa.model.HostResource; @@ -49,7 +49,7 @@ public class NodesSpecification { private final boolean exclusive; /** The repo part of a docker image (without tag), optional */ - private final Optional<DockerImage> dockerImageRepo; + private final Optional<ContainerImage> dockerImageRepo; /** The ID of the cluster referencing this node specification, if any */ private final Optional<String> combinedId; @@ -58,7 +58,7 @@ public class NodesSpecification { ClusterResources max, boolean dedicated, Version version, boolean required, boolean canFail, boolean exclusive, - Optional<DockerImage> dockerImageRepo, + Optional<ContainerImage> dockerImageRepo, Optional<String> combinedId) { if (max.smallerThan(min)) throw new IllegalArgumentException("Min resources must be larger or equal to max resources, but " + @@ -84,7 +84,7 @@ public class NodesSpecification { } private static NodesSpecification create(boolean dedicated, boolean canFail, Version version, - ModelElement nodesElement, Optional<DockerImage> dockerImageRepo) { + ModelElement nodesElement, Optional<ContainerImage> dockerImageRepo) { var resolvedElement = resolveElement(nodesElement); var combinedId = findCombinedId(nodesElement, resolvedElement); var resources = toResources(resolvedElement); @@ -370,9 +370,9 @@ public class NodesSpecification { return new IllegalArgumentException("referenced service '" + referenceId + "' is not defined"); } - private static Optional<DockerImage> dockerImageToUse(ModelElement nodesElement, Optional<DockerImage> dockerImage) { + private static Optional<ContainerImage> dockerImageToUse(ModelElement nodesElement, Optional<ContainerImage> dockerImage) { String dockerImageFromElement = nodesElement.stringAttribute("docker-image"); - return dockerImageFromElement == null ? dockerImage : Optional.of(DockerImage.fromString(dockerImageFromElement)); + return dockerImageFromElement == null ? dockerImage : Optional.of(ContainerImage.fromString(dockerImageFromElement)); } /** Parses a value ("value") or value range ("[min-value, max-value]") */ diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java index 779b6854e21..3c6550b9cd0 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java @@ -20,7 +20,7 @@ public class ClusterMembership { protected ClusterMembership() {} - private ClusterMembership(String stringValue, Version vespaVersion, Optional<DockerImage> dockerImageRepo) { + private ClusterMembership(String stringValue, Version vespaVersion, Optional<ContainerImage> dockerImageRepo) { String[] components = stringValue.split("/"); if (components.length < 4) throw new RuntimeException("Could not parse '" + stringValue + "' to a cluster membership. " + @@ -115,7 +115,7 @@ public class ClusterMembership { return new ClusterMembership(stringValue, vespaVersion, Optional.empty()); } - public static ClusterMembership from(String stringValue, Version vespaVersion, Optional<DockerImage> dockerImageRepo) { + public static ClusterMembership from(String stringValue, Version vespaVersion, Optional<ContainerImage> dockerImageRepo) { return new ClusterMembership(stringValue, vespaVersion, dockerImageRepo); } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java index 5b76163e97f..12cb150b37c 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java @@ -22,10 +22,10 @@ public final class ClusterSpec { private final Version vespaVersion; private boolean exclusive; private final Optional<Id> combinedId; - private final Optional<DockerImage> dockerImageRepo; + private final Optional<ContainerImage> dockerImageRepo; private ClusterSpec(Type type, Id id, Optional<Group> groupId, Version vespaVersion, boolean exclusive, - Optional<Id> combinedId, Optional<DockerImage> dockerImageRepo) { + Optional<Id> combinedId, Optional<ContainerImage> dockerImageRepo) { this.type = type; this.id = id; this.groupId = groupId; @@ -49,7 +49,7 @@ public final class ClusterSpec { public Id id() { return id; } /** Returns the docker image repository part of a docker image we want this cluster to run */ - public Optional<DockerImage> dockerImageRepo() { return dockerImageRepo; } + public Optional<ContainerImage> dockerImageRepo() { return dockerImageRepo; } /** Returns the docker image (repository + vespa version) we want this cluster to run */ public Optional<String> dockerImage() { return dockerImageRepo.map(repo -> repo + ":" + vespaVersion.toFullString()); } @@ -96,7 +96,7 @@ public final class ClusterSpec { private final boolean specification; private Optional<Group> groupId = Optional.empty(); - private Optional<DockerImage> dockerImageRepo = Optional.empty(); + private Optional<ContainerImage> dockerImageRepo = Optional.empty(); private Version vespaVersion; private boolean exclusive = false; private Optional<Id> combinedId = Optional.empty(); @@ -144,11 +144,11 @@ public final class ClusterSpec { @Deprecated // TODO: Remove after 7.208 is oldest version in use public Builder dockerImageRepo(Optional<String> dockerImageRepo) { - this.dockerImageRepo = dockerImageRepo.map(DockerImage::fromString); + this.dockerImageRepo = dockerImageRepo.map(ContainerImage::fromString); return this; } - public Builder dockerImageRepository(Optional<DockerImage> dockerImageRepo) { + public Builder dockerImageRepository(Optional<ContainerImage> dockerImageRepo) { this.dockerImageRepo = dockerImageRepo; return this; } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ContainerImage.java index bbf65c1cd47..be81102c20b 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ContainerImage.java @@ -11,14 +11,14 @@ import java.util.Optional; * * @author mpolden */ -public class DockerImage { +public class ContainerImage { - public static final DockerImage EMPTY = new DockerImage("", Optional.empty()); + public static final ContainerImage EMPTY = new ContainerImage("", Optional.empty()); private final String repository; private final Optional<String> tag; - private DockerImage(String repository, Optional<String> tag) { + private ContainerImage(String repository, Optional<String> tag) { this.repository = Objects.requireNonNull(repository, "repository must be non-null"); this.tag = Objects.requireNonNull(tag, "tag must be non-null"); } @@ -37,8 +37,8 @@ public class DockerImage { } /** Returns the Docker image tagged with the given version */ - public DockerImage withTag(Version version) { - return new DockerImage(repository, Optional.of(version.toFullString())); + public ContainerImage withTag(Version version) { + return new ContainerImage(repository, Optional.of(version.toFullString())); } public String asString() { @@ -54,7 +54,7 @@ public class DockerImage { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - DockerImage that = (DockerImage) o; + ContainerImage that = (ContainerImage) o; return repository.equals(that.repository) && tag.equals(that.tag); } @@ -64,16 +64,16 @@ public class DockerImage { return Objects.hash(repository, tag); } - public static DockerImage fromString(String name) { + public static ContainerImage fromString(String name) { if (name.isEmpty()) return EMPTY; int n = name.lastIndexOf(':'); - if (n < 0) return new DockerImage(name, Optional.empty()); + if (n < 0) return new ContainerImage(name, Optional.empty()); String tag = name.substring(n + 1); if (!tag.contains("/")) { - return new DockerImage(name.substring(0, n), Optional.of(tag)); + return new ContainerImage(name.substring(0, n), Optional.of(tag)); } - return new DockerImage(name, Optional.empty()); + return new ContainerImage(name, Optional.empty()); } } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java index 6bc3809bd54..18dc479948c 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java @@ -31,7 +31,7 @@ public class HostSpec implements Comparable<HostSpec> { private final Optional<Version> version; - private final Optional<DockerImage> dockerImageRepo; + private final Optional<ContainerImage> dockerImageRepo; private final Optional<NetworkPorts> networkPorts; @@ -50,7 +50,7 @@ public class HostSpec implements Comparable<HostSpec> { ClusterMembership membership, Optional<Version> version, Optional<NetworkPorts> networkPorts, - Optional<DockerImage> dockerImageRepo) { + Optional<ContainerImage> dockerImageRepo) { this(hostname, List.of(), realResources, @@ -70,7 +70,7 @@ public class HostSpec implements Comparable<HostSpec> { Optional<ClusterMembership> membership, Optional<Version> version, Optional<NetworkPorts> networkPorts, - Optional<DockerImage> dockerImageRepo) { + Optional<ContainerImage> dockerImageRepo) { if (hostname == null || hostname.isEmpty()) throw new IllegalArgumentException("Hostname must be specified"); this.hostname = hostname; this.aliases = List.copyOf(aliases); @@ -178,7 +178,7 @@ public class HostSpec implements Comparable<HostSpec> { public HostSpec(String hostname, List<String> aliases, Optional<Flavor> flavor, Optional<ClusterMembership> membership, Optional<Version> version, Optional<NetworkPorts> networkPorts, Optional<NodeResources> requestedResources, - Optional<DockerImage> dockerImageRepo) { + Optional<ContainerImage> dockerImageRepo) { this(hostname, aliases, flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()), flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()), @@ -216,7 +216,7 @@ public class HostSpec implements Comparable<HostSpec> { /** Returns the requested resources leading to this host being provisioned, or empty if unspecified */ public Optional<NodeResources> requestedResources() { return requestedResources.asOptional(); } - public Optional<DockerImage> dockerImageRepo() { return dockerImageRepo; } + public Optional<ContainerImage> dockerImageRepo() { return dockerImageRepo; } public HostSpec withPorts(Optional<NetworkPorts> ports) { return new HostSpec(hostname, aliases, realResources, advertisedResources, requestedResources, membership, version, ports, dockerImageRepo); diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java index e4913643e8d..46dab780826 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java @@ -3,7 +3,7 @@ package com.yahoo.config.provision.serialization; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ClusterMembership; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NodeResources; @@ -216,7 +216,7 @@ public class AllocatedHostsSerializer { return ClusterMembership.from(object.field(hostSpecMembershipKey).asString(), com.yahoo.component.Version.fromString(object.field(hostSpecVespaVersionKey).asString()), object.field(hostSpecDockerImageRepoKey).valid() - ? Optional.of(DockerImage.fromString(object.field(hostSpecDockerImageRepoKey).asString())) + ? Optional.of(ContainerImage.fromString(object.field(hostSpecDockerImageRepoKey).asString())) : Optional.empty()); } @@ -225,9 +225,9 @@ public class AllocatedHostsSerializer { return Optional.of(inspector.asString()); } - private static Optional<DockerImage> optionalDockerImage(Inspector inspector) { + private static Optional<ContainerImage> optionalDockerImage(Inspector inspector) { if ( ! inspector.valid()) return Optional.empty(); - return Optional.of(DockerImage.fromString(inspector.asString())); + return Optional.of(ContainerImage.fromString(inspector.asString())); } } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java index 71e039f6e8e..bf12bdb508f 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java @@ -42,7 +42,7 @@ public class ClusterMembershipTest { assertTrue(instance.cluster().dockerImageRepo().isEmpty()); } { - Optional<DockerImage> dockerImageRepo = Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar")); + Optional<ContainerImage> dockerImageRepo = Optional.of(ContainerImage.fromString("docker.foo.com:4443/vespa/bar")); ClusterMembership instance = ClusterMembership.from("combined/id1/4/37/exclusive/containerId1", Vtag.currentVersion, dockerImageRepo); ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion, dockerImageRepo); assertEquals(instance, serialized); diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java index 700bc389664..ee7ff257274 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java @@ -4,7 +4,7 @@ package com.yahoo.config.provision.serialization; import com.yahoo.component.Version; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ClusterMembership; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NetworkPorts; import com.yahoo.config.provision.NodeResources; @@ -39,10 +39,10 @@ public class AllocatedHostsSerializerTest { bigSlowDiskSpeedNode, anyDiskSpeedNode, ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"), - Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar"))), + Optional.of(ContainerImage.fromString("docker.foo.com:4443/vespa/bar"))), Optional.empty(), Optional.empty(), - Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar")))); + Optional.of(ContainerImage.fromString("docker.foo.com:4443/vespa/bar")))); hosts.add(new HostSpec("flavor-from-resources-2", smallSlowDiskSpeedNode, bigSlowDiskSpeedNode, diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index 11ce659625d..9f74c41dc49 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -5,7 +5,7 @@ import com.yahoo.component.Version; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.HostFilter; import com.yahoo.config.provision.Provisioner; import java.util.logging.Level; @@ -51,7 +51,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment { private final DeployLogger logger = new SilentDeployLogger(); /** The repository part of docker image this application should run on. Version is separate from image repo */ - final Optional<DockerImage> dockerImageRepository; + final Optional<ContainerImage> dockerImageRepository; /** The Vespa version this application should run on */ private final Version version; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 3d4198c65a9..73d0e66ef53 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -17,7 +17,7 @@ import com.yahoo.config.model.api.Provisioned; import com.yahoo.config.model.api.Quota; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.flags.FetchVector; @@ -48,7 +48,7 @@ public class ModelContextImpl implements ModelContext { private final ModelContext.Properties properties; private final Optional<File> appDir; - private final Optional<DockerImage> wantedDockerImageRepository; + private final Optional<ContainerImage> wantedDockerImageRepository; /** The version of Vespa we are building a model for */ private final Version modelVespaVersion; @@ -72,7 +72,7 @@ public class ModelContextImpl implements ModelContext { Provisioned provisioned, ModelContext.Properties properties, Optional<File> appDir, - Optional<DockerImage> wantedDockerImageRepository, + Optional<ContainerImage> wantedDockerImageRepository, Version modelVespaVersion, Version wantedNodeVespaVersion) { this.applicationPackage = applicationPackage; @@ -126,7 +126,7 @@ public class ModelContextImpl implements ModelContext { public Optional<File> appDir() { return appDir; } @Override - public Optional<DockerImage> wantedDockerImageRepo() { return wantedDockerImageRepository; } + public Optional<ContainerImage> wantedDockerImageRepo() { return wantedDockerImageRepository; } @Override public Version modelVespaVersion() { return modelVespaVersion; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java index 7fc6b35722f..168273bd349 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java @@ -12,7 +12,7 @@ import com.yahoo.config.model.api.Provisioned; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.TenantName; import com.yahoo.container.jdisc.secretstore.SecretStore; @@ -85,7 +85,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> { protected Application buildModelVersion(ModelFactory modelFactory, ApplicationPackage applicationPackage, ApplicationId applicationId, - Optional<DockerImage> wantedDockerImageRepository, + Optional<ContainerImage> wantedDockerImageRepository, Version wantedNodeVespaVersion, Optional<AllocatedHosts> ignored // Ignored since we have this in the app package for activated models ) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java index 245b9db020b..c80d044e831 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java @@ -10,7 +10,7 @@ import com.yahoo.config.model.api.Provisioned; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationLockException; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.OutOfCapacityException; import com.yahoo.component.Version; import com.yahoo.config.provision.TransientException; @@ -73,7 +73,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> { * and assigns to this SettableOptional such that it can be used after this method returns */ public List<MODELRESULT> buildModels(ApplicationId applicationId, - Optional<DockerImage> dockerImageRepository, + Optional<ContainerImage> dockerImageRepository, Version wantedNodeVespaVersion, ApplicationPackage applicationPackage, SettableOptional<AllocatedHosts> allocatedHosts, @@ -149,7 +149,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> { // versions is the set of versions for one particular major version private List<MODELRESULT> buildModelVersions(Set<Version> versions, ApplicationId applicationId, - Optional<DockerImage> wantedDockerImageRepository, + Optional<ContainerImage> wantedDockerImageRepository, Version wantedNodeVespaVersion, ApplicationPackage applicationPackage, SettableOptional<AllocatedHosts> allocatedHosts, @@ -242,7 +242,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> { } protected abstract MODELRESULT buildModelVersion(ModelFactory modelFactory, ApplicationPackage applicationPackage, - ApplicationId applicationId, Optional<DockerImage> dockerImageRepository, + ApplicationId applicationId, Optional<ContainerImage> dockerImageRepository, Version wantedNodeVespaVersion, Optional<AllocatedHosts> allocatedHosts); /** diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java index aa851a95335..611ef38c1f8 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java @@ -19,7 +19,7 @@ import com.yahoo.config.model.api.ValidationParameters.IgnoreValidationErrors; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.config.server.application.Application; import com.yahoo.vespa.config.server.application.ApplicationSet; import com.yahoo.vespa.config.server.application.PermanentApplicationPackage; @@ -80,7 +80,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P protected PreparedModelResult buildModelVersion(ModelFactory modelFactory, ApplicationPackage applicationPackage, ApplicationId applicationId, - Optional<DockerImage> wantedDockerImageRepository, + Optional<ContainerImage> wantedDockerImageRepository, Version wantedNodeVespaVersion, Optional<AllocatedHosts> allocatedHosts) { Version modelVersion = modelFactory.version(); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java index 1fea966503b..6524b18ab0e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java @@ -8,7 +8,7 @@ import com.yahoo.config.model.api.EndpointCertificateMetadata; import com.yahoo.config.model.api.Quota; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.TenantName; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.slime.SlimeUtils; @@ -55,7 +55,7 @@ public final class PrepareParams { private final List<ContainerEndpoint> containerEndpoints; private final Optional<String> tlsSecretsKeyName; private final Optional<EndpointCertificateMetadata> endpointCertificateMetadata; - private final Optional<DockerImage> dockerImageRepository; + private final Optional<ContainerImage> dockerImageRepository; private final Optional<AthenzDomain> athenzDomain; private final Optional<ApplicationRoles> applicationRoles; private final Optional<Quota> quota; @@ -64,7 +64,7 @@ public final class PrepareParams { boolean dryRun, boolean verbose, boolean isBootstrap, Optional<Version> vespaVersion, List<ContainerEndpoint> containerEndpoints, Optional<String> tlsSecretsKeyName, Optional<EndpointCertificateMetadata> endpointCertificateMetadata, - Optional<DockerImage> dockerImageRepository, Optional<AthenzDomain> athenzDomain, + Optional<ContainerImage> dockerImageRepository, Optional<AthenzDomain> athenzDomain, Optional<ApplicationRoles> applicationRoles, Optional<Quota> quota) { this.timeoutBudget = timeoutBudget; this.applicationId = Objects.requireNonNull(applicationId); @@ -94,7 +94,7 @@ public final class PrepareParams { private List<ContainerEndpoint> containerEndpoints = null; private Optional<String> tlsSecretsKeyName = Optional.empty(); private Optional<EndpointCertificateMetadata> endpointCertificateMetadata = Optional.empty(); - private Optional<DockerImage> dockerImageRepository = Optional.empty(); + private Optional<ContainerImage> dockerImageRepository = Optional.empty(); private Optional<AthenzDomain> athenzDomain = Optional.empty(); private Optional<ApplicationRoles> applicationRoles = Optional.empty(); private Optional<Quota> quota = Optional.empty(); @@ -168,12 +168,12 @@ public final class PrepareParams { public Builder dockerImageRepository(String dockerImageRepository) { this.dockerImageRepository = (dockerImageRepository == null) ? Optional.empty() - : Optional.of(DockerImage.fromString(dockerImageRepository)); + : Optional.of(ContainerImage.fromString(dockerImageRepository)); return this; } - public Builder dockerImageRepository(DockerImage dockerImageRepository) { - this.dockerImageRepository = Optional.ofNullable(dockerImageRepository); + public Builder dockerImageRepository(ContainerImage containerImageRepository) { + this.dockerImageRepository = Optional.ofNullable(containerImageRepository); return this; } @@ -282,7 +282,7 @@ public final class PrepareParams { return endpointCertificateMetadata; } - public Optional<DockerImage> dockerImageRepository() { + public Optional<ContainerImage> dockerImageRepository() { return dockerImageRepository; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java index b3e35e955de..0bd477b4514 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java @@ -9,7 +9,7 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.TenantName; import com.yahoo.path.Path; import com.yahoo.transaction.Transaction; @@ -126,7 +126,7 @@ public abstract class Session implements Comparable<Session> { sessionZooKeeperClient.writeVespaVersion(version); } - public void setDockerImageRepository(Optional<DockerImage> dockerImageRepository) { + public void setDockerImageRepository(Optional<ContainerImage> dockerImageRepository) { sessionZooKeeperClient.writeDockerImageRepository(dockerImageRepository); } @@ -151,7 +151,7 @@ public abstract class Session implements Comparable<Session> { public FileReference getApplicationPackageReference() {return sessionZooKeeperClient.readApplicationPackageReference(); } - public Optional<DockerImage> getDockerImageRepository() { return sessionZooKeeperClient.readDockerImageRepository(); } + public Optional<ContainerImage> getDockerImageRepository() { return sessionZooKeeperClient.readDockerImageRepository(); } public Version getVespaVersion() { return sessionZooKeeperClient.readVespaVersion(); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index 489cb8c8167..b146e90930f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -21,7 +21,7 @@ import com.yahoo.config.model.api.Quota; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.secretstore.SecretStore; @@ -157,7 +157,7 @@ public class SessionPreparer { final ApplicationId applicationId; /** The repository part of docker image to be used for this deployment */ - final Optional<DockerImage> dockerImageRepository; + final Optional<ContainerImage> dockerImageRepository; /** The version of Vespa the application to be prepared specifies for its nodes */ final Version vespaVersion; @@ -333,7 +333,7 @@ public class SessionPreparer { ApplicationPackage applicationPackage, ApplicationId applicationId, FileReference distributedApplicationPackage, - Optional<DockerImage> dockerImageRepository, + Optional<ContainerImage> dockerImageRepository, Version vespaVersion, DeployLogger deployLogger, Map<Version, FileRegistry> fileRegistryMap, diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java index ff168e102b9..b019f07951c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java @@ -11,10 +11,9 @@ import com.yahoo.config.model.api.Quota; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.TenantName; import com.yahoo.path.Path; -import com.yahoo.slime.JsonFormat; import com.yahoo.slime.SlimeUtils; import com.yahoo.text.Utf8; import com.yahoo.transaction.Transaction; @@ -28,7 +27,6 @@ import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.curator.transaction.CuratorOperations; import com.yahoo.vespa.curator.transaction.CuratorTransaction; -import java.io.ByteArrayOutputStream; import java.time.Instant; import java.util.Optional; import java.util.logging.Level; @@ -199,13 +197,13 @@ public class SessionZooKeeperClient { return new Version(configCurator.getData(versionPath())); } - public Optional<DockerImage> readDockerImageRepository() { + public Optional<ContainerImage> readDockerImageRepository() { if ( ! configCurator.exists(dockerImageRepositoryPath())) return Optional.empty(); String dockerImageRepository = configCurator.getData(dockerImageRepositoryPath()); - return dockerImageRepository.isEmpty() ? Optional.empty() : Optional.of(DockerImage.fromString(dockerImageRepository)); + return dockerImageRepository.isEmpty() ? Optional.empty() : Optional.of(ContainerImage.fromString(dockerImageRepository)); } - public void writeDockerImageRepository(Optional<DockerImage> dockerImageRepository) { + public void writeDockerImageRepository(Optional<ContainerImage> dockerImageRepository) { dockerImageRepository.ifPresent(repo -> configCurator.putData(dockerImageRepositoryPath(), repo.repository())); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java index 254fe62cba8..efb8a80240a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java @@ -15,7 +15,7 @@ import com.yahoo.config.model.provision.Hosts; import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.test.HostedConfigModelRegistry; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.Zone; @@ -102,7 +102,7 @@ public class HostedDeployTest { assertTrue(deployment.isPresent()); deployment.get().activate(); assertEquals("4.5.6", ((Deployment) deployment.get()).session().getVespaVersion().toString()); - assertEquals(DockerImage.fromString(dockerImageRepository), ((Deployment) deployment.get()).session().getDockerImageRepository().get()); + assertEquals(ContainerImage.fromString(dockerImageRepository), ((Deployment) deployment.get()).session().getDockerImageRepository().get()); assertEquals("myDomain", ((Deployment) deployment.get()).session().getAthenzDomain().get().value()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java index cc4f39b0789..7fe826167f8 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java @@ -6,7 +6,7 @@ import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationLockException; import com.yahoo.config.provision.ApplicationName; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.OutOfCapacityException; import com.yahoo.config.provision.TenantName; @@ -280,7 +280,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { request(HttpRequest.Method.PUT, sessionId, Map.of("dockerImageRepository", dockerImageRepository, "applicationName", applicationId().application().value())); applicationRepository.activate(tenantRepository.getTenant(tenant), sessionId, timeoutBudget, false); - assertEquals(DockerImage.fromString(dockerImageRepository), + assertEquals(ContainerImage.fromString(dockerImageRepository), applicationRepository.getActiveSession(applicationId()).getDockerImageRepository().get()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java index 32d5d84f323..18bab3bf348 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java @@ -6,11 +6,10 @@ import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ClusterMembership; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NodeFlavors; -import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provisioning.FlavorsConfig; import com.yahoo.io.IOUtils; import com.yahoo.path.Path; @@ -50,9 +49,9 @@ public class ZKApplicationPackageTest { TEST_FLAVOR.get().resources(), TEST_FLAVOR.get().resources(), ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"), - Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar"))), + Optional.of(ContainerImage.fromString("docker.foo.com:4443/vespa/bar"))), Optional.of(Version.fromString("6.0.1")), Optional.empty(), - Optional.of(DockerImage.fromString("docker repo"))))); + Optional.of(ContainerImage.fromString("docker repo"))))); private ConfigCurator configCurator; diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java index 717a4296b81..688583e13d5 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.hosted.controller.api.application.v4.model; 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.zone.ZoneId; import com.yahoo.vespa.athenz.api.AthenzDomain; import com.yahoo.vespa.hosted.controller.api.integration.aws.ApplicationRoles; @@ -28,7 +28,7 @@ public class DeploymentData { private final Version platform; private final Set<ContainerEndpoint> containerEndpoints; private final Optional<EndpointCertificateMetadata> endpointCertificateMetadata; - private final Optional<DockerImage> dockerImageRepo; + private final Optional<ContainerImage> dockerImageRepo; private final Optional<AthenzDomain> athenzDomain; private final Optional<ApplicationRoles> applicationRoles; private final Optional<Quota> quota; @@ -36,7 +36,7 @@ public class DeploymentData { public DeploymentData(ApplicationId instance, ZoneId zone, byte[] applicationPackage, Version platform, Set<ContainerEndpoint> containerEndpoints, Optional<EndpointCertificateMetadata> endpointCertificateMetadata, - Optional<DockerImage> dockerImageRepo, + Optional<ContainerImage> dockerImageRepo, Optional<AthenzDomain> athenzDomain, Optional<ApplicationRoles> applicationRoles, Optional<Quota> quota) { @@ -76,7 +76,7 @@ public class DeploymentData { return endpointCertificateMetadata; } - public Optional<DockerImage> dockerImageRepo() { + public Optional<ContainerImage> dockerImageRepo() { return dockerImageRepo; } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java index 07e411cd5cd..b0838f1c070 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.configserver; 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.HostName; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; @@ -31,8 +31,8 @@ public class Node { private final Version wantedVersion; private final Version currentOsVersion; private final Version wantedOsVersion; - private final DockerImage currentDockerImage; - private final DockerImage wantedDockerImage; + private final ContainerImage currentContainerImage; + private final ContainerImage wantedContainerImage; private final ServiceState serviceState; private final Optional<Instant> suspendedSince; private final Optional<Instant> currentFirmwareCheck; @@ -54,7 +54,7 @@ public class Node { Optional<Instant> currentFirmwareCheck, Optional<Instant> wantedFirmwareCheck, ServiceState serviceState, Optional<Instant> suspendedSince, long restartGeneration, long wantedRestartGeneration, long rebootGeneration, long wantedRebootGeneration, int cost, String flavor, String clusterId, ClusterType clusterType, boolean wantToRetire, boolean wantToDeprovision, - Optional<TenantName> reservedTo, DockerImage wantedDockerImage, DockerImage currentDockerImage) { + Optional<TenantName> reservedTo, ContainerImage wantedContainerImage, ContainerImage currentContainerImage) { this.hostname = hostname; this.parentHostname = parentHostname; this.state = state; @@ -80,8 +80,8 @@ public class Node { this.wantToRetire = wantToRetire; this.wantToDeprovision = wantToDeprovision; this.reservedTo = reservedTo; - this.wantedDockerImage = wantedDockerImage; - this.currentDockerImage = currentDockerImage; + this.wantedContainerImage = wantedContainerImage; + this.currentContainerImage = currentContainerImage; } public HostName hostname() { @@ -122,12 +122,12 @@ public class Node { return wantedOsVersion; } - public DockerImage currentDockerImage() { - return currentDockerImage; + public ContainerImage currentDockerImage() { + return currentContainerImage; } - public DockerImage wantedDockerImage() { - return wantedDockerImage; + public ContainerImage wantedDockerImage() { + return wantedContainerImage; } public Optional<Instant> currentFirmwareCheck() { @@ -241,8 +241,8 @@ public class Node { private Version wantedVersion; private Version currentOsVersion; private Version wantedOsVersion; - private DockerImage currentDockerImage; - private DockerImage wantedDockerImage; + private ContainerImage currentContainerImage; + private ContainerImage wantedContainerImage; private Optional<Instant> currentFirmwareCheck = Optional.empty(); private Optional<Instant> wantedFirmwareCheck = Optional.empty(); private ServiceState serviceState; @@ -272,8 +272,8 @@ public class Node { this.wantedVersion = node.wantedVersion; this.currentOsVersion = node.currentOsVersion; this.wantedOsVersion = node.wantedOsVersion; - this.currentDockerImage = node.currentDockerImage; - this.wantedDockerImage = node.wantedDockerImage; + this.currentContainerImage = node.currentContainerImage; + this.wantedContainerImage = node.wantedContainerImage; this.currentFirmwareCheck = node.currentFirmwareCheck; this.wantedFirmwareCheck = node.wantedFirmwareCheck; this.serviceState = node.serviceState; @@ -341,13 +341,13 @@ public class Node { return this; } - public Builder currentDockerImage(DockerImage currentDockerImage) { - this.currentDockerImage = currentDockerImage; + public Builder currentDockerImage(ContainerImage currentContainerImage) { + this.currentContainerImage = currentContainerImage; return this; } - public Builder wantedDockerImage(DockerImage wantedDockerImage) { - this.wantedDockerImage = wantedDockerImage; + public Builder wantedDockerImage(ContainerImage wantedContainerImage) { + this.wantedContainerImage = wantedContainerImage; return this; } @@ -431,7 +431,7 @@ public class Node { currentOsVersion, wantedOsVersion, currentFirmwareCheck, wantedFirmwareCheck, serviceState, suspendedSince, restartGeneration, wantedRestartGeneration, rebootGeneration, wantedRebootGeneration, cost, flavor, clusterId, clusterType, wantToRetire, wantToDeprovision, reservedTo, - wantedDockerImage, currentDockerImage); + wantedContainerImage, currentContainerImage); } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java index aebfab7cbff..91485d000f2 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.configserver; 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.HostName; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; @@ -211,8 +211,8 @@ public interface NodeRepository { return s == null ? Version.emptyVersion : Version.fromString(s); } - private static DockerImage dockerImageFrom(String s) { - return s == null ? DockerImage.EMPTY : DockerImage.fromString(s); + private static ContainerImage dockerImageFrom(String s) { + return s == null ? ContainerImage.EMPTY : ContainerImage.fromString(s); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 7135cbe77c9..61208772930 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -6,7 +6,7 @@ import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.application.api.ValidationId; import com.yahoo.config.application.api.ValidationOverrides; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.TenantName; @@ -513,13 +513,13 @@ public class ApplicationController { Optional<EndpointCertificateMetadata> endpointCertificateMetadata, Optional<ApplicationRoles> applicationRoles) { try { - Optional<DockerImage> dockerImageRepo = Optional.ofNullable( + Optional<ContainerImage> dockerImageRepo = Optional.ofNullable( dockerImageRepoFlag .with(FetchVector.Dimension.ZONE_ID, zone.value()) .with(FetchVector.Dimension.APPLICATION_ID, application.serializedForm()) .value()) .filter(s -> !s.isBlank()) - .map(DockerImage::fromString); + .map(ContainerImage::fromString); Optional<AthenzDomain> domain = controller.tenants().get(application.tenant()) .filter(tenant-> tenant instanceof AthenzTenant) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index 1dd3b4a7a47..0bae2507950 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -7,7 +7,7 @@ import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.NodeResources; @@ -76,7 +76,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer private final Map<DeploymentId, ServiceConvergence> serviceStatus = new HashMap<>(); private final Set<ApplicationId> disallowConvergenceCheckApplications = new HashSet<>(); private final Version initialVersion = new Version(6, 1, 0); - private final DockerImage initialDockerImage = DockerImage.fromString("dockerImage:6.1.0"); + private final ContainerImage initialContainerImage = ContainerImage.fromString("dockerImage:6.1.0"); private final Set<DeploymentId> suspendedApplications = new HashSet<>(); private final Map<ZoneId, Set<LoadBalancer>> loadBalancers = new HashMap<>(); private final Set<Environment> deferLoadBalancerProvisioning = new HashSet<>(); @@ -122,8 +122,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer .parentHostname(parent.hostname()) .currentVersion(initialVersion) .wantedVersion(initialVersion) - .currentDockerImage(initialDockerImage) - .wantedDockerImage(initialDockerImage) + .currentDockerImage(initialContainerImage) + .wantedDockerImage(initialContainerImage) .currentOsVersion(Version.emptyVersion) .wantedOsVersion(Version.emptyVersion) .resources(new NodeResources(2, 8, 50, 1, slow, remote)) diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java index 1e861f230ce..2eed86a26de 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.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.dockerapi; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import java.util.Objects; @@ -10,7 +10,7 @@ import java.util.Objects; */ public class Container { public final String hostname; - public final DockerImage image; + public final ContainerImage image; public final ContainerResources resources; public final ContainerName name; public final State state; @@ -18,7 +18,7 @@ public class Container { public Container( final String hostname, - final DockerImage image, + final ContainerImage image, final ContainerResources resources, final ContainerName containerName, final State state, diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerEngine.java index 477d0edf8be..2ba82b83287 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerEngine.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.dockerapi; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import java.net.InetAddress; import java.nio.file.Path; @@ -11,10 +11,9 @@ import java.util.Optional; import java.util.OptionalLong; /** - * API to simplify the com.github.dockerjava API for clients, - * and to avoid OSGi exporting those classes. + * API that hides the access to a specific container engine like Docker or Podman. */ -public interface Docker { +public interface ContainerEngine { interface CreateContainerCommand { CreateContainerCommand withHostName(String hostname); @@ -23,7 +22,7 @@ public interface Docker { CreateContainerCommand withEnvironment(String name, String value); /** - * Mounts a directory on host inside the docker container. + * Mounts a directory on host inside the container. * * <p>Bind mount content will be <b>private</b> to this container (and host) only. * @@ -38,7 +37,7 @@ public interface Docker { CreateContainerCommand withVolume(Path path, Path volumePath); /** - * Mounts a directory on host inside the docker container. + * Mounts a directory on host inside the container. * * <p>The bind mount content will be <b>shared</b> among multiple containers. * @@ -59,7 +58,7 @@ public interface Docker { void create(); } - CreateContainerCommand createContainerCommand(DockerImage dockerImage, ContainerName containerName); + CreateContainerCommand createContainerCommand(ContainerImage containerImage, ContainerName containerName); Optional<ContainerStats> getContainerStats(ContainerName containerName); @@ -77,14 +76,14 @@ public interface Docker { * Checks if the image is currently being pulled or is already pulled, if not, starts an async * pull of the image * - * @param image Docker image to pull + * @param image Container image to pull * @return true iff image being pulled, false otherwise */ - boolean pullImageAsyncIfNeeded(DockerImage image); + boolean pullImageAsyncIfNeeded(ContainerImage image); boolean noManagedContainersRunning(String manager); - boolean deleteUnusedDockerImages(List<DockerImage> excludes, Duration minImageAgeToDelete); + boolean deleteUnusedContainerImages(List<ContainerImage> excludes, Duration minImageAgeToDelete); /** * @param containerName The name of the container diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java index 30d79c57296..38c3074afe5 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java @@ -7,7 +7,7 @@ import com.github.dockerjava.api.model.Bind; import com.github.dockerjava.api.model.Capability; import com.github.dockerjava.api.model.HostConfig; import com.github.dockerjava.api.model.Ulimit; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.exception.DockerException; import java.net.Inet6Address; @@ -26,10 +26,10 @@ import java.util.stream.Stream; import static com.yahoo.vespa.hosted.dockerapi.DockerImpl.LABEL_NAME_MANAGEDBY; -class CreateContainerCommandImpl implements Docker.CreateContainerCommand { +class CreateContainerCommandImpl implements ContainerEngine.CreateContainerCommand { private final DockerClient docker; - private final DockerImage dockerImage; + private final ContainerImage containerImage; private final ContainerName containerName; private final Map<String, String> labels = new HashMap<>(); private final List<String> environmentAssignments = new ArrayList<>(); @@ -48,74 +48,74 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { private Optional<String[]> entrypoint = Optional.empty(); private boolean privileged = false; - CreateContainerCommandImpl(DockerClient docker, DockerImage dockerImage, ContainerName containerName) { + CreateContainerCommandImpl(DockerClient docker, ContainerImage containerImage, ContainerName containerName) { this.docker = docker; - this.dockerImage = dockerImage; + this.containerImage = containerImage; this.containerName = containerName; } @Override - public Docker.CreateContainerCommand withHostName(String hostName) { + public ContainerEngine.CreateContainerCommand withHostName(String hostName) { this.hostName = Optional.of(hostName); return this; } @Override - public Docker.CreateContainerCommand withResources(ContainerResources containerResources) { + public ContainerEngine.CreateContainerCommand withResources(ContainerResources containerResources) { this.containerResources = Optional.of(containerResources); return this; } @Override - public Docker.CreateContainerCommand withLabel(String name, String value) { + public ContainerEngine.CreateContainerCommand withLabel(String name, String value) { assert !name.contains("="); labels.put(name, value); return this; } - public Docker.CreateContainerCommand withManagedBy(String manager) { + public ContainerEngine.CreateContainerCommand withManagedBy(String manager) { return withLabel(LABEL_NAME_MANAGEDBY, manager); } @Override - public Docker.CreateContainerCommand withAddCapability(String capabilityName) { + public ContainerEngine.CreateContainerCommand withAddCapability(String capabilityName) { addCapabilities.add(Capability.valueOf(capabilityName)); return this; } @Override - public Docker.CreateContainerCommand withDropCapability(String capabilityName) { + public ContainerEngine.CreateContainerCommand withDropCapability(String capabilityName) { dropCapabilities.add(Capability.valueOf(capabilityName)); return this; } @Override - public Docker.CreateContainerCommand withSecurityOpt(String securityOpt) { + public ContainerEngine.CreateContainerCommand withSecurityOpt(String securityOpt) { securityOpts.add(securityOpt); return this; } @Override - public Docker.CreateContainerCommand withDnsOption(String dnsOption) { + public ContainerEngine.CreateContainerCommand withDnsOption(String dnsOption) { dnsOptions.add(dnsOption); return this; } @Override - public Docker.CreateContainerCommand withPrivileged(boolean privileged) { + public ContainerEngine.CreateContainerCommand withPrivileged(boolean privileged) { this.privileged = privileged; return this; } @Override - public Docker.CreateContainerCommand withUlimit(String name, int softLimit, int hardLimit) { + public ContainerEngine.CreateContainerCommand withUlimit(String name, int softLimit, int hardLimit) { ulimits.add(new Ulimit(name, softLimit, hardLimit)); return this; } @Override - public Docker.CreateContainerCommand withEntrypoint(String... entrypoint) { + public ContainerEngine.CreateContainerCommand withEntrypoint(String... entrypoint) { if (entrypoint.length < 1) throw new IllegalArgumentException("Entrypoint must contain at least 1 element"); this.entrypoint = Optional.of(entrypoint); return this; @@ -123,32 +123,32 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { @Override - public Docker.CreateContainerCommand withEnvironment(String name, String value) { + public ContainerEngine.CreateContainerCommand withEnvironment(String name, String value) { assert name.indexOf('=') == -1; environmentAssignments.add(name + "=" + value); return this; } @Override - public Docker.CreateContainerCommand withVolume(Path path, Path volumePath) { + public ContainerEngine.CreateContainerCommand withVolume(Path path, Path volumePath) { volumeBindSpecs.add(path + ":" + volumePath + ":Z"); return this; } @Override - public Docker.CreateContainerCommand withSharedVolume(Path path, Path volumePath) { + public ContainerEngine.CreateContainerCommand withSharedVolume(Path path, Path volumePath) { volumeBindSpecs.add(path + ":" + volumePath + ":z"); return this; } @Override - public Docker.CreateContainerCommand withNetworkMode(String mode) { + public ContainerEngine.CreateContainerCommand withNetworkMode(String mode) { networkMode = Optional.of(mode); return this; } @Override - public Docker.CreateContainerCommand withIpAddress(InetAddress address) { + public ContainerEngine.CreateContainerCommand withIpAddress(InetAddress address) { if (address instanceof Inet6Address) { ipv6Address = Optional.of(address.getHostAddress()); } else { @@ -190,7 +190,7 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { .withCpuQuota(cr.cpuQuota() > 0 ? (long) cr.cpuQuota() : null)); final CreateContainerCmd containerCmd = docker - .createContainerCmd(dockerImage.asString()) + .createContainerCmd(containerImage.asString()) .withHostConfig(hostConfig) .withName(containerName.asString()) .withLabels(labels) @@ -255,7 +255,7 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { toOptionalOption("--ip6", ipv6Address), toOptionalOption("--entrypoint", entrypointExecuteable), toFlagOption("--privileged", privileged), - dockerImage.asString(), + containerImage.asString(), entrypointArgs) .filter(s -> !s.isEmpty()) .collect(Collectors.joining(" ")); diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollector.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollector.java index e2116f7037e..d4b44b8dff6 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollector.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollector.java @@ -5,7 +5,7 @@ import com.github.dockerjava.api.model.Container; import com.github.dockerjava.api.model.Image; import com.google.common.base.Strings; import com.yahoo.collections.Pair; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import java.time.Clock; import java.time.Duration; @@ -72,7 +72,7 @@ class DockerImageGarbageCollector { * @param minImageAgeToDelete Minimum duration after which an image can be removed if it has not been used * @return true iff at least 1 image was deleted */ - boolean deleteUnusedDockerImages(List<DockerImage> excludes, Duration minImageAgeToDelete) { + boolean deleteUnusedDockerImages(List<ContainerImage> excludes, Duration minImageAgeToDelete) { List<Image> images = docker.listAllImages(); List<Container> containers = docker.listAllContainers(); @@ -100,7 +100,7 @@ class DockerImageGarbageCollector { Set<String> imagesToKeep = Stream .concat( getRecentlyUsedImageIds(images, containers, minImageAgeToDelete).stream(), // 1 - dockerImageToImageIds(excludes, images).stream()) // 2 + containerImageToImageIds(excludes, images).stream()) // 2 .flatMap(imageId -> ancestorsByImageId.getOrDefault(imageId, Collections.emptySet()).stream()) // 3 .collect(Collectors.toSet()); @@ -128,7 +128,7 @@ class DockerImageGarbageCollector { // Deleting an image by image ID with multiple tags will fail -> delete by tags instead referencesOf(image).forEach(imageReference -> { logger.info("Deleting unused docker image " + imageReference); - docker.deleteImage(DockerImage.fromString(imageReference)); + docker.deleteImage(ContainerImage.fromString(imageReference)); }); lastTimeUsedByImageId.remove(image.getId()); }) @@ -152,18 +152,18 @@ class DockerImageGarbageCollector { } /** - * Attemps to make dockerImages which may be image tags or image ids to image ids. This only works + * Attemps to make containerImages which may be image tags or image ids to image ids. This only works * if the given tag is actually present locally. This is fine, because if it isn't - we can't delete * it, so no harm done. */ - private Set<String> dockerImageToImageIds(List<DockerImage> dockerImages, List<Image> images) { + private Set<String> containerImageToImageIds(List<ContainerImage> containerImages, List<Image> images) { Map<String, String> imageIdByImageTag = images.stream() .flatMap(image -> referencesOf(image).stream() .map(repoTag -> new Pair<>(repoTag, image.getId()))) .collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)); - return dockerImages.stream() - .map(DockerImage::asString) + return containerImages.stream() + .map(ContainerImage::asString) .map(tag -> imageIdByImageTag.getOrDefault(tag, tag)) .collect(Collectors.toSet()); } diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index eb795de89b6..15bafa9b561 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -21,8 +21,7 @@ import com.github.dockerjava.core.command.ExecStartResultCallback; import com.github.dockerjava.core.command.PullImageResultCallback; import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; import com.google.inject.Inject; -import com.yahoo.config.provision.DockerImage; -import java.util.logging.Level; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.exception.ContainerNotFoundException; import com.yahoo.vespa.hosted.dockerapi.exception.DockerException; import com.yahoo.vespa.hosted.dockerapi.exception.DockerExecTimeoutException; @@ -40,10 +39,11 @@ import java.util.OptionalLong; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; -public class DockerImpl implements Docker { +public class DockerImpl implements ContainerEngine { private static final Logger logger = Logger.getLogger(DockerImpl.class.getName()); static final String LABEL_NAME_MANAGEDBY = "com.yahoo.vespa.managedby"; @@ -51,7 +51,7 @@ public class DockerImpl implements Docker { private static final Duration WAIT_BEFORE_KILLING = Duration.ofSeconds(10); private final Object monitor = new Object(); - private final Set<DockerImage> scheduledPulls = new HashSet<>(); + private final Set<ContainerImage> scheduledPulls = new HashSet<>(); private final DockerClient dockerClient; private final DockerImageGarbageCollector dockerImageGC; @@ -70,7 +70,7 @@ public class DockerImpl implements Docker { } @Override - public boolean pullImageAsyncIfNeeded(DockerImage image) { + public boolean pullImageAsyncIfNeeded(ContainerImage image) { try { synchronized (monitor) { if (scheduledPulls.contains(image)) return true; @@ -89,7 +89,7 @@ public class DockerImpl implements Docker { } } - private void removeScheduledPoll(DockerImage image) { + private void removeScheduledPoll(ContainerImage image) { synchronized (monitor) { scheduledPulls.remove(image); } @@ -98,23 +98,23 @@ public class DockerImpl implements Docker { /** * Check if a given image is already in the local registry */ - boolean imageIsDownloaded(DockerImage dockerImage) { - return inspectImage(dockerImage).isPresent(); + boolean imageIsDownloaded(ContainerImage containerImage) { + return inspectImage(containerImage).isPresent(); } - private Optional<InspectImageResponse> inspectImage(DockerImage dockerImage) { + private Optional<InspectImageResponse> inspectImage(ContainerImage containerImage) { try { - return Optional.of(dockerClient.inspectImageCmd(dockerImage.asString()).exec()); + return Optional.of(dockerClient.inspectImageCmd(containerImage.asString()).exec()); } catch (NotFoundException e) { return Optional.empty(); } catch (RuntimeException e) { numberOfDockerApiFails.increment(); - throw new DockerException("Failed to inspect image '" + dockerImage.asString() + "'", e); + throw new DockerException("Failed to inspect image '" + containerImage.asString() + "'", e); } } @Override - public CreateContainerCommand createContainerCommand(DockerImage image, ContainerName containerName) { + public CreateContainerCommand createContainerCommand(ContainerImage image, ContainerName containerName) { return new CreateContainerCommandImpl(dockerClient, image, containerName); } @@ -265,7 +265,7 @@ public class DockerImpl implements Docker { return inspectContainerCmd(container) .map(response -> new Container( response.getConfig().getHostName(), - DockerImage.fromString(response.getConfig().getImage()), + ContainerImage.fromString(response.getConfig().getImage()), containerResourcesFromHostConfig(response.getHostConfig()), new ContainerName(decode(response.getName())), Container.State.valueOf(response.getState().getStatus().toUpperCase()), @@ -319,44 +319,44 @@ public class DockerImpl implements Docker { } } - void deleteImage(DockerImage dockerImage) { + void deleteImage(ContainerImage containerImage) { try { - dockerClient.removeImageCmd(dockerImage.asString()).exec(); + dockerClient.removeImageCmd(containerImage.asString()).exec(); } catch (NotFoundException ignored) { // Image was already deleted, ignore } catch (RuntimeException e) { numberOfDockerApiFails.increment(); - throw new DockerException("Failed to delete docker image " + dockerImage.asString(), e); + throw new DockerException("Failed to delete docker image " + containerImage.asString(), e); } } @Override - public boolean deleteUnusedDockerImages(List<DockerImage> excludes, Duration minImageAgeToDelete) { + public boolean deleteUnusedContainerImages(List<ContainerImage> excludes, Duration minImageAgeToDelete) { return dockerImageGC.deleteUnusedDockerImages(excludes, minImageAgeToDelete); } private class ImagePullCallback extends PullImageResultCallback { - private final DockerImage dockerImage; + private final ContainerImage containerImage; - private ImagePullCallback(DockerImage dockerImage) { - this.dockerImage = dockerImage; + private ImagePullCallback(ContainerImage containerImage) { + this.containerImage = containerImage; } @Override public void onError(Throwable throwable) { - removeScheduledPoll(dockerImage); - logger.log(Level.SEVERE, "Could not download image " + dockerImage.asString(), throwable); + removeScheduledPoll(containerImage); + logger.log(Level.SEVERE, "Could not download image " + containerImage.asString(), throwable); } @Override public void onComplete() { - if (imageIsDownloaded(dockerImage)) { - logger.log(Level.INFO, "Download completed: " + dockerImage.asString()); - removeScheduledPoll(dockerImage); + if (imageIsDownloaded(containerImage)) { + logger.log(Level.INFO, "Download completed: " + containerImage.asString()); + removeScheduledPoll(containerImage); } else { numberOfDockerApiFails.increment(); - throw new DockerClientException("Could not download image: " + dockerImage); + throw new DockerClientException("Could not download image: " + containerImage); } } } diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ContainerImageGarbageCollectionTest.java index 40c4cb167a2..92c0e52bd6f 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ContainerImageGarbageCollectionTest.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.model.Image; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.test.ManualClock; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.mockito.Mockito.when; /** * @author freva */ -public class DockerImageGarbageCollectionTest { +public class ContainerImageGarbageCollectionTest { private final ImageGcTester gcTester = new ImageGcTester(); @@ -173,7 +173,7 @@ public class DockerImageGarbageCollectionTest { private final DockerImpl docker = mock(DockerImpl.class); private final ManualClock clock = new ManualClock(); private final DockerImageGarbageCollector imageGC = new DockerImageGarbageCollector(docker, clock); - private final Map<DockerImage, Integer> numDeletes = new HashMap<>(); + private final Map<ContainerImage, Integer> numDeletes = new HashMap<>(); private boolean initialized = false; private ImageGcTester withExistingImages(ImageBuilder... images) { @@ -211,11 +211,11 @@ public class DockerImageGarbageCollectionTest { clock.advance(Duration.ofMinutes(minutesAfter)); imageGC.deleteUnusedDockerImages( - except.stream().map(DockerImage::fromString).collect(Collectors.toList()), + except.stream().map(ContainerImage::fromString).collect(Collectors.toList()), Duration.ofHours(1).minusSeconds(1)); Arrays.stream(imageIds) - .map(DockerImage::fromString) + .map(ContainerImage::fromString) .forEach(image -> { int newValue = numDeletes.getOrDefault(image, 0) + 1; numDeletes.put(image, newValue); diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java index 57d2c738904..ea92186e8bd 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.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.dockerapi; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import org.junit.Test; import java.net.InetAddress; @@ -14,13 +14,13 @@ public class CreateContainerCommandImplTest { @Test public void testToString() throws UnknownHostException { - DockerImage dockerImage = DockerImage.fromString("docker.registry.domain.tld/my/image:1.2.3"); + ContainerImage containerImage = ContainerImage.fromString("docker.registry.domain.tld/my/image:1.2.3"); ContainerResources containerResources = new ContainerResources(2.5, 100, 1024); String hostname = "docker-1.region.domain.tld"; ContainerName containerName = ContainerName.fromHostname(hostname); - Docker.CreateContainerCommand createContainerCommand = new CreateContainerCommandImpl( - null, dockerImage, containerName) + ContainerEngine.CreateContainerCommand createContainerCommand = new CreateContainerCommandImpl( + null, containerImage, containerName) .withHostName(hostname) .withResources(containerResources) .withLabel("my-label", "test-label") diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java index 1ca6cd5662e..5387bc390fe 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java @@ -13,7 +13,7 @@ import com.github.dockerjava.api.command.InspectImageResponse; import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.core.command.ExecStartResultCallback; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -75,7 +75,7 @@ public class DockerImplTest { @Test @SuppressWarnings({"unchecked", "rawtypes"}) public void pullImageAsyncIfNeededSuccessfully() { - final DockerImage image = DockerImage.fromString("test:1.2.3"); + final ContainerImage image = ContainerImage.fromString("test:1.2.3"); InspectImageResponse inspectImageResponse = mock(InspectImageResponse.class); when(inspectImageResponse.getId()).thenReturn(image.asString()); @@ -104,7 +104,7 @@ public class DockerImplTest { @Test @SuppressWarnings({"unchecked", "rawtypes"}) public void pullImageAsyncIfNeededWithError() { - final DockerImage image = DockerImage.fromString("test:1.2.3"); + final ContainerImage image = ContainerImage.fromString("test:1.2.3"); InspectImageCmd imageInspectCmd = mock(InspectImageCmd.class); when(imageInspectCmd.exec()).thenThrow(new NotFoundException("Image not found")); 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) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index 983ba5165e3..0f721a87f11 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -7,7 +7,7 @@ import com.yahoo.component.AbstractComponent; import com.yahoo.component.Version; import com.yahoo.concurrent.maintenance.JobControl; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeType; @@ -131,7 +131,7 @@ public class NodeRepository extends AbstractComponent { Clock.systemUTC(), zone, new DnsNameResolver(), - DockerImage.fromString(config.dockerImage()), + ContainerImage.fromString(config.dockerImage()), flagSource, config.useCuratorClientCache(), provisionServiceProvider.getHostProvisioner().isPresent(), @@ -148,7 +148,7 @@ public class NodeRepository extends AbstractComponent { Clock clock, Zone zone, NameResolver nameResolver, - DockerImage dockerImage, + ContainerImage containerImage, FlagSource flagSource, boolean useCuratorClientCache, boolean canProvisionHosts, @@ -164,7 +164,7 @@ public class NodeRepository extends AbstractComponent { this.osVersions = new OsVersions(this); this.infrastructureVersions = new InfrastructureVersions(db); this.firmwareChecks = new FirmwareChecks(db, clock); - this.dockerImages = new DockerImages(db, dockerImage); + this.dockerImages = new DockerImages(db, containerImage); this.jobControl = new JobControl(new JobControlFlags(db, flagSource)); this.applications = new Applications(db); this.canProvisionHosts = canProvisionHosts; @@ -202,7 +202,7 @@ public class NodeRepository extends AbstractComponent { public CuratorDatabaseClient database() { return db; } /** Returns the Docker image to use for given node */ - public DockerImage dockerImage(Node node) { return dockerImages.dockerImageFor(node.type()); } + public ContainerImage dockerImage(Node node) { return dockerImages.dockerImageFor(node.type()); } /** @return The name resolver used to resolve hostname and ip addresses */ public NameResolver nameResolver() { return nameResolver; } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java index 3e5ef81e614..7630fe7dce3 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.hosted.provision.node; import com.yahoo.component.Version; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import java.time.Instant; import java.util.Objects; @@ -17,7 +17,7 @@ public class Status { private final Generation reboot; private final Optional<Version> vespaVersion; - private final Optional<DockerImage> dockerImage; + private final Optional<ContainerImage> dockerImage; private final int failCount; private final boolean wantToRetire; private final boolean wantToDeprovision; @@ -26,7 +26,7 @@ public class Status { public Status(Generation generation, Optional<Version> vespaVersion, - Optional<DockerImage> dockerImage, + Optional<ContainerImage> dockerImage, int failCount, boolean wantToRetire, boolean wantToDeprovision, @@ -34,7 +34,7 @@ public class Status { Optional<Instant> firmwareVerifiedAt) { this.reboot = Objects.requireNonNull(generation, "Generation must be non-null"); this.vespaVersion = Objects.requireNonNull(vespaVersion, "Vespa version must be non-null").filter(v -> !Version.emptyVersion.equals(v)); - this.dockerImage = Objects.requireNonNull(dockerImage, "Docker image must be non-null").filter(d -> !DockerImage.EMPTY.equals(d)); + this.dockerImage = Objects.requireNonNull(dockerImage, "Docker image must be non-null").filter(d -> !ContainerImage.EMPTY.equals(d)); this.failCount = failCount; if (wantToDeprovision && !wantToRetire) { throw new IllegalArgumentException("Node cannot be marked wantToDeprovision unless it's also marked wantToRetire"); @@ -58,10 +58,10 @@ public class Status { public Optional<Version> vespaVersion() { return vespaVersion; } /** Returns a copy of this with the docker image changed */ - public Status withDockerImage(DockerImage dockerImage) { return new Status(reboot, vespaVersion, Optional.of(dockerImage), failCount, wantToRetire, wantToDeprovision, osVersion, firmwareVerifiedAt); } + public Status withDockerImage(ContainerImage containerImage) { return new Status(reboot, vespaVersion, Optional.of(containerImage), failCount, wantToRetire, wantToDeprovision, osVersion, firmwareVerifiedAt); } /** Returns the docker image the node is running, if known */ - public Optional<DockerImage> dockerImage() { return dockerImage; } + public Optional<ContainerImage> dockerImage() { return dockerImage; } public Status withIncreasedFailCount() { return new Status(reboot, vespaVersion, dockerImage, failCount + 1, wantToRetire, wantToDeprovision, osVersion, firmwareVerifiedAt); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java index cc62ae67e84..5f31c8e9522 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java @@ -5,7 +5,7 @@ import com.google.common.util.concurrent.UncheckedTimeoutException; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationLockException; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeType; @@ -492,11 +492,11 @@ public class CuratorDatabaseClient { // Docker images ----------------------------------------------------------- - public Map<NodeType, DockerImage> readDockerImages() { + public Map<NodeType, ContainerImage> readDockerImages() { return read(dockerImagesPath, NodeTypeDockerImagesSerializer::fromJson).orElseGet(TreeMap::new); } - public void writeDockerImages(Map<NodeType, DockerImage> dockerImages) { + public void writeDockerImages(Map<NodeType, ContainerImage> dockerImages) { NestedTransaction transaction = new NestedTransaction(); CuratorTransaction curatorTransaction = db.newCuratorTransactionIn(transaction); curatorTransaction.add(CuratorOperations.setData(dockerImagesPath.getAbsolute(), diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java index 37842115949..98c35ec5464 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java @@ -6,7 +6,7 @@ import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.ClusterMembership; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.NodeFlavors; @@ -291,14 +291,14 @@ public class NodeSerializer { return Optional.of(Version.fromString(object.asString())); } - private Optional<DockerImage> dockerImageRepoFromSlime(Inspector object) { + private Optional<ContainerImage> dockerImageRepoFromSlime(Inspector object) { if ( ! object.valid() || object.asString().isEmpty()) return Optional.empty(); - return Optional.of(DockerImage.fromString(object.asString())); + return Optional.of(ContainerImage.fromString(object.asString())); } - private Optional<DockerImage> dockerImageFromSlime(Inspector object) { + private Optional<ContainerImage> dockerImageFromSlime(Inspector object) { if ( ! object.valid()) return Optional.empty(); - return Optional.of(DockerImage.fromString(object.asString())); + return Optional.of(ContainerImage.fromString(object.asString())); } private Optional<Instant> instantFromSlime(Inspector object) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeDockerImagesSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeDockerImagesSerializer.java index 6615dff24e5..6621d48844e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeDockerImagesSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeDockerImagesSerializer.java @@ -1,7 +1,7 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.persistence; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeType; import com.yahoo.slime.Cursor; import com.yahoo.slime.Inspector; @@ -23,7 +23,7 @@ public class NodeTypeDockerImagesSerializer { private NodeTypeDockerImagesSerializer() {} - public static byte[] toJson(Map<NodeType, DockerImage> dockerImages) { + public static byte[] toJson(Map<NodeType, ContainerImage> dockerImages) { Slime slime = new Slime(); Cursor object = slime.setObject(); dockerImages.forEach((nodeType, dockerImage) -> @@ -35,11 +35,11 @@ public class NodeTypeDockerImagesSerializer { } } - public static Map<NodeType, DockerImage> fromJson(byte[] data) { - Map<NodeType, DockerImage> dockerImages = new TreeMap<>(); // Use TreeMap to sort by node type + public static Map<NodeType, ContainerImage> fromJson(byte[] data) { + Map<NodeType, ContainerImage> dockerImages = new TreeMap<>(); // Use TreeMap to sort by node type Inspector inspector = SlimeUtils.jsonToSlime(data).get(); inspector.traverse((ObjectTraverser) (key, value) -> - dockerImages.put(NodeSerializer.nodeTypeFromString(key), DockerImage.fromString(value.asString()))); + dockerImages.put(NodeSerializer.nodeTypeFromString(key), ContainerImage.fromString(value.asString()))); return dockerImages; } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerImages.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerImages.java index 3f55307d1f3..ee3ff22474f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerImages.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerImages.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.provision.provisioning; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.curator.Lock; import com.yahoo.vespa.hosted.provision.persistence.CuratorDatabaseClient; @@ -26,7 +26,7 @@ public class DockerImages { private static final Logger log = Logger.getLogger(DockerImages.class.getName()); private final CuratorDatabaseClient db; - private final DockerImage defaultImage; + private final ContainerImage defaultImage; private final Duration cacheTtl; /** @@ -34,13 +34,13 @@ public class DockerImages { * unnecessary ZK reads. When getDockerImages change, some nodes may need to wait for TTL until they see the new target, * this is fine. */ - private volatile Supplier<Map<NodeType, DockerImage>> dockerImages; + private volatile Supplier<Map<NodeType, ContainerImage>> dockerImages; - public DockerImages(CuratorDatabaseClient db, DockerImage defaultImage) { + public DockerImages(CuratorDatabaseClient db, ContainerImage defaultImage) { this(db, defaultImage, defaultCacheTtl); } - DockerImages(CuratorDatabaseClient db, DockerImage defaultImage, Duration cacheTtl) { + DockerImages(CuratorDatabaseClient db, ContainerImage defaultImage, Duration cacheTtl) { this.db = db; this.defaultImage = defaultImage; this.cacheTtl = cacheTtl; @@ -53,29 +53,29 @@ public class DockerImages { } /** Returns the current docker images for each node type */ - public Map<NodeType, DockerImage> getDockerImages() { + public Map<NodeType, ContainerImage> getDockerImages() { return dockerImages.get(); } /** Returns the current docker image for given node type, or the type for corresponding child nodes * if it is a Docker host, or default */ - public DockerImage dockerImageFor(NodeType type) { + public ContainerImage dockerImageFor(NodeType type) { NodeType typeToUseForLookup = type.isHost() ? type.childNodeType() : type; return getDockerImages().getOrDefault(typeToUseForLookup, defaultImage); } /** Set the docker image for nodes of given type */ - public void setDockerImage(NodeType nodeType, Optional<DockerImage> dockerImage) { + public void setDockerImage(NodeType nodeType, Optional<ContainerImage> dockerImage) { if (nodeType.isHost()) { throw new IllegalArgumentException("Setting docker image for " + nodeType + " nodes is unsupported"); } try (Lock lock = db.lockDockerImages()) { - Map<NodeType, DockerImage> dockerImages = db.readDockerImages(); + Map<NodeType, ContainerImage> dockerImages = db.readDockerImages(); dockerImage.ifPresentOrElse(image -> dockerImages.put(nodeType, image), () -> dockerImages.remove(nodeType)); db.writeDockerImages(dockerImages); createCache(); // Throw away current cache - log.info("Set docker image for " + nodeType + " nodes to " + dockerImage.map(DockerImage::asString).orElse(null)); + log.info("Set docker image for " + nodeType + " nodes to " + dockerImage.map(ContainerImage::asString).orElse(null)); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java index 19276a81ef8..3871ad6680a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.provision.restapi; import com.google.common.base.Suppliers; import com.yahoo.component.Version; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeResources; @@ -101,7 +101,7 @@ public class NodePatcher { case "currentDockerImage" : if (node.flavor().getType() != Flavor.Type.DOCKER_CONTAINER) throw new IllegalArgumentException("Docker image can only be set for docker containers"); - return node.with(node.status().withDockerImage(DockerImage.fromString(asString(value)))); + return node.with(node.status().withDockerImage(ContainerImage.fromString(asString(value)))); case "vespaVersion" : case "currentVespaVersion" : return node.with(node.status().withVespaVersion(Version.fromString(asString(value)))); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java index 3efd6e417cb..f469bd682f7 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.provision.restapi; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterMembership; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.serialization.NetworkPortsSerializer; @@ -211,7 +211,7 @@ class NodesResponse extends HttpResponse { // Hack: For non-docker nodes, return current docker image as default prefix + current Vespa version // TODO: Remove current + wanted docker image from response for non-docker types - private Optional<DockerImage> currentDockerImage(Node node) { + private Optional<ContainerImage> currentDockerImage(Node node) { return node.status().dockerImage() .or(() -> Optional.of(node) .filter(n -> n.flavor().getType() != Flavor.Type.DOCKER_CONTAINER) diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java index 5080dafe2a5..a27b7d093fd 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.provision.restapi; 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.Flavor; import com.yahoo.config.provision.HostFilter; import com.yahoo.config.provision.NodeFlavors; @@ -390,11 +390,11 @@ public class NodesV2ApiHandler extends LoggingRequestHandler { } if (dockerImageField.valid()) { - Optional<DockerImage> dockerImage = Optional.of(dockerImageField.asString()) + Optional<ContainerImage> dockerImage = Optional.of(dockerImageField.asString()) .filter(s -> !s.isEmpty()) - .map(DockerImage::fromString); + .map(ContainerImage::fromString); nodeRepository.dockerImages().setDockerImage(nodeType, dockerImage); - messageParts.add("docker image to " + dockerImage.map(DockerImage::asString).orElse(null)); + messageParts.add("docker image to " + dockerImage.map(ContainerImage::asString).orElse(null)); } if (messageParts.isEmpty()) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java index f78560e3022..bf993250253 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java @@ -7,7 +7,7 @@ import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.InstanceName; @@ -63,7 +63,7 @@ public class MockNodeRepository extends NodeRepository { Clock.fixed(Instant.ofEpochMilli(123), ZoneId.of("Z")), Zone.defaultZone(), new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, @@ -92,14 +92,14 @@ public class MockNodeRepository extends NodeRepository { new Flavor(new NodeResources(1, 4, 100, 1, fast, local)), Optional.empty(), NodeType.tenant); node4 = node4.with(node4.status() .withVespaVersion(new Version("6.41.0")) - .withDockerImage(DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa:6.41.0"))); + .withDockerImage(ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa:6.41.0"))); nodes.add(node4); Node node5 = createNode("node5", "host5.yahoo.com", ipConfig(5), Optional.of("dockerhost2.yahoo.com"), new Flavor(new NodeResources(1, 8, 100, 1, slow, remote)), Optional.empty(), NodeType.tenant); nodes.add(node5.with(node5.status() .withVespaVersion(new Version("1.2.3")) - .withDockerImage(DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa:1.2.3")))); + .withDockerImage(ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa:1.2.3")))); nodes.add(createNode("node6", "host6.yahoo.com", ipConfig(6), Optional.empty(), @@ -114,7 +114,7 @@ public class MockNodeRepository extends NodeRepository { Status node10newStatus = node10.status(); node10newStatus = node10newStatus .withVespaVersion(Version.fromString("5.104.142")) - .withDockerImage(DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa:5.104.142")); + .withDockerImage(ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa:5.104.142")); node10 = node10.with(node10newStatus); nodes.add(node10); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java index 9b0500303d8..1a5a3995609 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.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.provision; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeType; @@ -40,7 +40,7 @@ public class NodeRepositoryTester { clock, Zone.defaultZone(), new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java index 59e0dad9720..382b37332a1 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java @@ -11,7 +11,7 @@ import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeFlavors; @@ -63,7 +63,7 @@ public class CapacityCheckerTester { clock, zone, new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java index f8e21ebbfce..3726e846103 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java @@ -6,7 +6,7 @@ import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostSpec; @@ -257,7 +257,7 @@ public class FailedExpirerTest { clock, zone, new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-image"), + ContainerImage.fromString("docker-image"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java index 39e873ee110..f339dc6732b 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.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.provision.maintenance; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeType; @@ -40,7 +40,7 @@ public class MaintenanceTester { clock, zone, new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java index 20c9d24d1b6..780e0a285ca 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.provision.maintenance; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterMembership; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; @@ -84,7 +84,7 @@ public class MetricsReporterTest { Clock.systemUTC(), Zone.defaultZone(), new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, @@ -153,7 +153,7 @@ public class MetricsReporterTest { Clock.systemUTC(), Zone.defaultZone(), new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java index 435dcdf9223..c37eb58b501 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java @@ -5,7 +5,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostSpec; @@ -81,7 +81,7 @@ public class NodeFailTester { clock, zone, new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java index 1ff00ff88a1..af0bb1a6e2e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java @@ -6,7 +6,7 @@ import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.InstanceName; @@ -60,7 +60,7 @@ public class OperatorChangeApplicationMaintainerTest { clock, zone, new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java index c94d9022c3f..5095f21f0cd 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java @@ -6,8 +6,8 @@ import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Deployer; -import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.InstanceName; @@ -66,7 +66,7 @@ public class PeriodicApplicationMaintainerTest { clock, zone, new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirerTest.java index bd92c2a9aa2..ee1328a1eea 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirerTest.java @@ -5,7 +5,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeResources; @@ -51,7 +51,7 @@ public class ReservationExpirerTest { clock, Zone.defaultZone(), new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java index 4e675d6a3cc..e9a1808dcdb 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java @@ -7,7 +7,7 @@ import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Deployer; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostSpec; @@ -70,7 +70,7 @@ public class RetiredExpirerTest { clock, zone, new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java index 6cd206cd5b9..6641c5c94a0 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.provision.maintenance; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeFlavors; @@ -245,7 +245,7 @@ public class SpareCapacityMaintainerTest { new ManualClock(), new Zone(Environment.prod, RegionName.from("us-east-3")), new MockNameResolver().mockAnyLookup(), - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), new InMemoryFlagSource(), true, false, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeDockerImagesSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeDockerImagesSerializerTest.java index 9bfcf67324a..0633f70900e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeDockerImagesSerializerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeDockerImagesSerializerTest.java @@ -1,7 +1,7 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.persistence; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.NodeType; import org.junit.Test; @@ -17,11 +17,11 @@ public class NodeTypeDockerImagesSerializerTest { @Test public void test_serialization() { - Map<NodeType, DockerImage> images = new TreeMap<>(); - images.put(NodeType.host, DockerImage.fromString("docker.domain.tld/my/repo:1.2.3")); - images.put(NodeType.confighost, DockerImage.fromString("docker.domain.tld/my/image:2.1")); + Map<NodeType, ContainerImage> images = new TreeMap<>(); + images.put(NodeType.host, ContainerImage.fromString("docker.domain.tld/my/repo:1.2.3")); + images.put(NodeType.confighost, ContainerImage.fromString("docker.domain.tld/my/image:2.1")); - Map<NodeType, DockerImage> serialized = NodeTypeDockerImagesSerializer.fromJson(NodeTypeDockerImagesSerializer.toJson(images)); + Map<NodeType, ContainerImage> serialized = NodeTypeDockerImagesSerializer.fromJson(NodeTypeDockerImagesSerializer.toJson(images)); assertEquals(images, serialized); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerImagesTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java index cd6ae587b04..47989baa162 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerImagesTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java @@ -1,7 +1,7 @@ // Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.provisioning; -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.flags.InMemoryFlagSource; @@ -14,18 +14,18 @@ import static org.junit.Assert.assertEquals; /** * @author mpolden */ -public class DockerImagesTest { +public class ContainerImagesTest { @Test public void image_selection() { var flagSource = new InMemoryFlagSource(); var tester = new ProvisioningTester.Builder().flagSource(flagSource).build(); - var proxyImage = DockerImage.fromString("docker-registry.domain.tld:8080/dist/proxy"); + var proxyImage = ContainerImage.fromString("docker-registry.domain.tld:8080/dist/proxy"); tester.nodeRepository().dockerImages().setDockerImage(NodeType.proxy, Optional.of(proxyImage)); // Host uses tenant default image (for preload purposes) - var defaultImage = DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"); + var defaultImage = ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"); var hosts = tester.makeReadyNodes(2, "default", NodeType.host); tester.deployZoneApp(); for (var host : hosts) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java index 5c730912c49..0331ab7cf32 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java @@ -7,7 +7,7 @@ import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostFilter; @@ -177,8 +177,8 @@ public class ProvisioningTest { HostSpec host1 = state1.container0.iterator().next(); Node node1 = tester.nodeRepository().getNode(host1.hostname()).get(); - DockerImage dockerImage = DockerImage.fromString(dockerImageRepo).withTag(Version.fromString("1.2.3")); - tester.nodeRepository().write(node1.with(node1.status().withDockerImage(dockerImage)), () -> {}); + ContainerImage containerImage = ContainerImage.fromString(dockerImageRepo).withTag(Version.fromString("1.2.3")); + tester.nodeRepository().write(node1.with(node1.status().withDockerImage(containerImage)), () -> {}); // redeploy SystemState state2 = prepare(application1, tester, 1, 1, 1 ,1 , false, defaultResources, "1.2.3", Optional.of(dockerImageRepo)); @@ -186,7 +186,7 @@ public class ProvisioningTest { host1 = state2.container0.iterator().next(); node1 = tester.nodeRepository().getNode(host1.hostname()).get(); - assertEquals(dockerImage, node1.status().dockerImage().get()); + assertEquals(containerImage, node1.status().dockerImage().get()); } @Test diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index d56cae799b2..d41d79796f6 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -7,7 +7,7 @@ import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.ContainerImage; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostFilter; import com.yahoo.config.provision.HostSpec; @@ -103,7 +103,7 @@ public class ProvisioningTester { clock, zone, nameResolver, - DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), + ContainerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), flagSource, true, provisionServiceProvider.getHostProvisioner().isPresent(), |