From a3132a6bf2c9ab84b2a831a22c9fa43e0c52dd48 Mon Sep 17 00:00:00 2001 From: Øyvind Grønnesby Date: Wed, 22 Mar 2023 15:33:32 +0100 Subject: Maintain cache of plans in use --- .../maintenance/CloudDatabaseMaintainer.java | 26 ++++++++++++++++++++++ .../maintenance/ControllerMaintenance.java | 1 + .../controller/restapi/user/UserApiHandler.java | 5 ++--- .../integration/ServiceRegistryMock.java | 2 +- .../restapi/controller/responses/maintenance.json | 3 +++ .../controller/restapi/user/UserApiTest.java | 4 ++++ 6 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudDatabaseMaintainer.java (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudDatabaseMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudDatabaseMaintainer.java new file mode 100644 index 00000000000..914707aa318 --- /dev/null +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudDatabaseMaintainer.java @@ -0,0 +1,26 @@ +package com.yahoo.vespa.hosted.controller.maintenance; + +import com.yahoo.vespa.hosted.controller.Controller; +import com.yahoo.vespa.hosted.controller.tenant.Tenant; +import com.yahoo.yolean.Exceptions; + +import java.time.Duration; + +public class CloudDatabaseMaintainer extends ControllerMaintainer { + + public CloudDatabaseMaintainer(Controller controller, Duration interval) { + super(controller, interval); + } + + @Override + protected double maintain() { + try { + var tenants = controller().tenants().asList().stream().map(Tenant::name).toList(); + controller().serviceRegistry().billingController().updateCache(tenants); + } catch (Exception e) { + log.warning("Could not update cloud database cache: " + Exceptions.toMessageString(e)); + return 0.0; + } + return 1.0; + } +} diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java index bcc8296da2a..05159b38ec6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java @@ -75,6 +75,7 @@ public class ControllerMaintenance extends AbstractComponent { maintainers.add(new TenantRoleCleanupMaintainer(controller, intervals.tenantRoleMaintainer)); maintainers.add(new ChangeRequestMaintainer(controller, intervals.changeRequestMaintainer)); maintainers.add(new VcmrMaintainer(controller, intervals.vcmrMaintainer, metric)); + maintainers.add(new CloudDatabaseMaintainer(controller, intervals.defaultInterval)); maintainers.add(new CloudTrialExpirer(controller, intervals.defaultInterval)); maintainers.add(new RetriggerMaintainer(controller, intervals.retriggerMaintainer)); maintainers.add(new UserManagementMaintainer(controller, intervals.userManagementMaintainer, controller.serviceRegistry().roleMaintainer())); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java index a9787e28113..3811ec22555 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java @@ -368,9 +368,8 @@ public class UserApiHandler extends ThreadedHttpRequestHandler { private boolean hasTrialCapacity() { if (! controller.system().isPublic()) return true; - var existing = controller.tenants().asList().stream().map(Tenant::name).toList(); - var trialTenants = controller.serviceRegistry().billingController().tenantsWithPlan(existing, PlanId.from("trial")); - return maxTrialTenants.value() < 0 || trialTenants.size() < maxTrialTenants.value(); + var plan = controller.serviceRegistry().planRegistry().plan("trial"); + return controller.serviceRegistry().billingController().tenantsWithPlanUnderLimit(plan.get(), maxTrialTenants.value()); } private static Inspector bodyInspector(HttpRequest request) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java index 998b371bbf1..d80c55fd00a 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java @@ -85,7 +85,7 @@ public class ServiceRegistryMock extends AbstractComponent implements ServiceReg private final MockEnclaveAccessService mockAMIService = new MockEnclaveAccessService(); private final MockResourceTagger mockResourceTagger = new MockResourceTagger(); private final MockRoleService roleService = new MockRoleService(); - private final BillingController billingController = new MockBillingController(clock); + private final MockBillingController billingController = new MockBillingController(clock); private final ArtifactRegistryMock containerRegistry = new ArtifactRegistryMock(); private final NoopTenantSecretService tenantSecretService = new NoopTenantSecretService(); private final NoopEndpointSecretManager secretManager = new NoopEndpointSecretManager(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json index 113ad1af6d1..34a3520dd1d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json @@ -27,6 +27,9 @@ { "name": "ChangeRequestMaintainer" }, + { + "name": "CloudDatabaseMaintainer" + }, { "name": "CloudTrialExpirer" }, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java index 075e001655f..b3c992cdac7 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java @@ -8,6 +8,7 @@ import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.flags.InMemoryFlagSource; import com.yahoo.vespa.flags.PermanentFlags; import com.yahoo.vespa.hosted.controller.ControllerTester; +import com.yahoo.vespa.hosted.controller.api.integration.billing.MockBillingController; import com.yahoo.vespa.hosted.controller.api.integration.billing.PlanId; import com.yahoo.jdisc.http.filter.security.misc.User; import com.yahoo.vespa.hosted.controller.api.integration.user.UserId; @@ -19,6 +20,7 @@ import com.yahoo.vespa.hosted.controller.tenant.Tenant; import org.junit.jupiter.api.Test; import java.io.File; +import java.util.List; import java.util.Set; import static com.yahoo.application.container.handler.Request.Method.DELETE; @@ -262,6 +264,7 @@ public class UserApiTest extends ControllerContainerCloudTest { .withBooleanFlag(PermanentFlags.ENABLE_PUBLIC_SIGNUP_FLOW.id(), true); Set operator = Set.of(Role.hostedOperator(), Role.hostedSupporter(), Role.hostedAccountant()); User user = new User("dev@domail", "Joe Developer", "dev", null); + tester.controller().serviceRegistry().billingController().updateCache(List.of()); Role developer = Role.developer(TenantName.from("scoober")); tester.userManagement().createRole(developer); @@ -292,6 +295,7 @@ public class UserApiTest extends ControllerContainerCloudTest { User user = new User("dev@domail", "Joe Developer", "dev", null); controller.createTenant("tenant1", Tenant.Type.cloud); + ((MockBillingController) controller.serviceRegistry().billingController()).setTenants(controller.controller().tenants().asList().stream().map(Tenant::name).toList()); tester.assertResponse( request("/user/v1/user").user(user), -- cgit v1.2.3