diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-02-04 17:16:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-04 17:16:59 +0100 |
| commit | 8882668f2eee7547f09cff11ce3d3eefcb56869a (patch) | |
| tree | 3e8b6662c80df618146641447d45f9d8eaa3630a | |
| parent | 857c68c6e9da9f4915de5e975d06fe423e0959e7 (diff) | |
| parent | 0781f73dd5bffe1d805352214a9cc10a22ee4a59 (diff) | |
Merge pull request #21077 from vespa-engine/hakonhall/always-create-unique-s3-bucket-name
Always create unique s3 bucket name
3 files changed, 3 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java index c939055ffa5..69eda662692 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java @@ -15,7 +15,7 @@ import java.util.Set; */ public interface ArchiveService { - ArchiveBucket createArchiveBucketFor(ZoneId zoneId, boolean sharded); + ArchiveBucket createArchiveBucketFor(ZoneId zoneId); void updateBucketPolicy(ZoneId zoneId, ArchiveBucket bucket, Map<TenantName, String> authorizeIamRoleByTenantName); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java index 796ca46ae4e..ce7b56ad1f6 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java @@ -19,7 +19,7 @@ public class MockArchiveService implements ArchiveService { public Map<String, Set<String>> authorizedIamRolesForKey = new TreeMap<>(); @Override - public ArchiveBucket createArchiveBucketFor(ZoneId zoneId, boolean sharded) { + public ArchiveBucket createArchiveBucketFor(ZoneId zoneId) { return new ArchiveBucket("bucketName", "keyArn"); } 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 3a232216d46..21914b87818 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 @@ -72,8 +72,7 @@ public class CuratorArchiveBucketDb { } // We'll have to create a new bucket - var newBucket = archiveService.createArchiveBucketFor(zoneId, tenantsPerBucket().isPresent()) - .withTenant(tenant); + var newBucket = archiveService.createArchiveBucketFor(zoneId).withTenant(tenant); zoneBuckets.add(newBucket); curatorDb.writeArchiveBuckets(zoneId, zoneBuckets); updateArchiveUriCache(zoneId, zoneBuckets); |