diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-02-03 18:49:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-03 18:49:54 +0100 |
commit | d2016c76bc927fd42824ff5635b9aeb2b7022805 (patch) | |
tree | f7e5a40f2c8f9c60540775b7b3540c38e60424df | |
parent | d56accc88cc8bc2d4b29c4647586e4e262c9ea39 (diff) | |
parent | 291c514e6eadfc6dd1c02b87c6d05303a9872a27 (diff) |
Merge pull request #21059 from vespa-engine/revert-21053-hakonhall/set-archiveurl-for-controllers
Revert "Set archiveUrl for controllers"
2 files changed, 2 insertions, 9 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java index 36ab2e6f384..7d7fa71e72c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java @@ -29,8 +29,8 @@ public class ArchiveUriUpdater extends ControllerMaintainer { private final NodeRepository nodeRepository; private final CuratorArchiveBucketDb archiveBucketDb; - public ArchiveUriUpdater(Controller controller, Duration interval) { - super(controller, interval); + public ArchiveUriUpdater(Controller controller, Duration duration) { + super(controller, duration); this.applications = controller.applications(); this.nodeRepository = controller.serviceRegistry().configServer().nodeRepository(); this.archiveBucketDb = controller.archiveBucketDb(); @@ -39,10 +39,6 @@ public class ArchiveUriUpdater extends ControllerMaintainer { @Override protected double maintain() { Map<ZoneId, Set<TenantName>> tenantsByZone = new HashMap<>(); - - tenantsByZone.put(controller().zoneRegistry().systemZone().getVirtualId(), - new HashSet<>(INFRASTRUCTURE_TENANTS)); - for (var application : applications.asList()) { for (var instance : application.instances().values()) { for (var deployment : instance.deployments().values()) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java index 0a2f5d9a236..451991f9604 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java @@ -43,9 +43,6 @@ public class ArchiveUriUpdaterTest { // Initially we should not set any archive URIs as the archive service does not return any updater.maintain(); assertArchiveUris(Map.of(), zone); - // but the controller zone is always present - assertArchiveUris(Map.of(TenantName.from("hosted-vespa"), "s3://bucketName/hosted-vespa/"), - ZoneId.from("prod", "controller")); // Archive service now has URI for tenant1, but tenant1 is not deployed in zone setBucketNameInService(Map.of(tenant1, "uri-1"), zone); |