diff options
| author | Øyvind Grønnesby <oyving@yahooinc.com> | 2023-10-03 10:35:47 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@yahooinc.com> | 2023-10-03 10:35:47 +0200 |
| commit | c92c2d89e01190094b44d35ef4e7467d7d558777 (patch) | |
| tree | b8ee63d0e28855faa50faa02664d401bd1a33afc /controller-server | |
| parent | acd0add7a3e7c16279e4d37f817e2d84f87f937f (diff) | |
Expire none tenants after three months
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java index 18ef47759f4..472fa1cd9a1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java @@ -28,7 +28,7 @@ public class CloudTrialExpirer extends ControllerMaintainer { private static final Logger log = Logger.getLogger(CloudTrialExpirer.class.getName()); private static final Duration nonePlanAfter = Duration.ofDays(14); - private static final Duration tombstoneAfter = Duration.ofDays(183); + private static final Duration tombstoneAfter = Duration.ofDays(91); private final ListFlag<String> extendedTrialTenants; public CloudTrialExpirer(Controller controller, Duration interval) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java index c5c70998624..6463e3a92bd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java @@ -37,7 +37,7 @@ public class CloudTrialExpirerTest { @Test void tombstone_inactive_none() { - registerTenant("none-tenant", "none", Duration.ofDays(183).plusMillis(1)); + registerTenant("none-tenant", "none", Duration.ofDays(91).plusMillis(1)); assertEquals(1.0, expirer.maintain()); assertEquals(Tenant.Type.deleted, tester.controller().tenants().get(TenantName.from("none-tenant"), true).get().type()); } |