diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-05-06 10:46:58 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-05-06 11:29:38 +0200 |
commit | 776dc24d57f0d9f49412eeb33e4c912c7fe561c9 (patch) | |
tree | f1bc0b14a0d66533c9ce11bb4aaba9297c5b4b46 /controller-server | |
parent | 6dcb3cac408e8a4219043709a924f762ab2cec79 (diff) |
Code review fixes
Diffstat (limited to 'controller-server')
3 files changed, 10 insertions, 10 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java index 47eeb291dd7..81fbb85e3d7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java @@ -37,18 +37,18 @@ public class ArtifactExpirer extends ControllerMaintainer { @Override protected double maintain() { + VersionStatus versionStatus = controller().readVersionStatus(); return controller().clouds().stream() .flatMapToDouble(cloud -> controller().serviceRegistry().artifactRegistry(cloud).stream() - .mapToDouble(artifactRegistry -> maintain(cloud, artifactRegistry))) + .mapToDouble(artifactRegistry -> maintain(versionStatus, cloud, artifactRegistry))) .average() .orElse(1); } - private double maintain(CloudName cloudName, ArtifactRegistry artifactRegistry) { + private double maintain(VersionStatus versionStatus, CloudName cloudName, ArtifactRegistry artifactRegistry) { try { Instant now = controller().clock().instant(); - VersionStatus versionStatus = controller().readVersionStatus(); List<Artifact> artifactsToExpire = artifactRegistry.list().stream() .filter(artifact -> isExpired(artifact, now, versionStatus)) .collect(Collectors.toList()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRegistryMock.java index 1d3974fe7a7..ef0445e06c6 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRegistryMock.java @@ -15,9 +15,9 @@ import java.util.stream.Collectors; */ public class ArtifactRegistryMock implements ArtifactRegistry { - private static final Comparator<Artifact> comparator = Comparator.comparing((Artifact artifact) -> artifact.registry().orElse("")) - .thenComparing(artifact -> artifact.repository().orElse("")) - .thenComparing(Artifact::version); + private static final Comparator<Artifact> comparator = Comparator.comparing(Artifact::registry) + .thenComparing(Artifact::repository) + .thenComparing(Artifact::version); private final Map<String, Artifact> images = new HashMap<>(); @@ -27,8 +27,8 @@ public class ArtifactRegistryMock implements ArtifactRegistry { } @Override - public void deleteAll(List<Artifact> images) { - images.forEach(image -> this.images.remove(image.id())); + public void deleteAll(List<Artifact> artifacts) { + artifacts.forEach(image -> this.images.remove(image.id())); } @Override diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirerTest.java index 9a19d4d0185..7703266c9ba 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirerTest.java @@ -26,8 +26,8 @@ public class ArtifactExpirerTest { ArtifactRegistryMock registry = tester.controllerTester().serviceRegistry().artifactRegistry(CloudName.defaultName()).orElseThrow(); Instant instant = tester.clock().instant(); - Artifact image0 = new Artifact("image0", "registry.example.com", "vespa/vespa", "7.4", instant, Version.fromString("7.1")); - Artifact image1 = new Artifact("image1", "registry.example.com", "vespa/vespa", "7.4-amd64", instant, Version.fromString("7.2")); + Artifact image0 = new Artifact("image0", "registry.example.com", "vespa/vespa", "7.1", instant, Version.fromString("7.1")); + Artifact image1 = new Artifact("image1", "registry.example.com", "vespa/vespa", "7.2-amd64", instant, Version.fromString("7.2")); Artifact image2 = new Artifact("image2", "registry.example.com", "vespa/vespa", "7.4-amd64", instant, Version.fromString("7.4")); registry.add(image0) .add(image1) |