diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2021-09-10 13:43:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-10 13:43:06 +0200 |
| commit | 557635a3973ee0614a4ca1651c065e2b79bc4d81 (patch) | |
| tree | 0702e7f8264d3b60f6e866cae4b47f75a9de956a /controller-server | |
| parent | 0d078821e520188a3c65918770eb658c6bce04ba (diff) | |
Revert "Revert "Enable S3 archive bucket for CD""
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java index 0f5c2123325..52c192cfeab 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java @@ -1,6 +1,7 @@ // Copyright 2021 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.archive; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.text.Text; @@ -45,7 +46,8 @@ public class CuratorArchiveBucketDb { public CuratorArchiveBucketDb(Controller controller) { this.archiveService = controller.serviceRegistry().archiveService(); this.curatorDb = controller.curator(); - this.enabled = controller.zoneRegistry().system().isPublic(); + SystemName system = controller.zoneRegistry().system(); + this.enabled = system.isPublic() || system.isCd(); } public Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant) { |