From 9dfa07a9aeb065a3acd05c8c141745b141652baa Mon Sep 17 00:00:00 2001 From: Ola Aunrønning Date: Wed, 7 Jul 2021 16:27:48 +0200 Subject: Return partial response if getQuota fails --- .../restapi/application/ApplicationApiHandler.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 6704e6a0906..c1e6c362c83 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -2091,12 +2091,16 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { controller.serviceRegistry().roleService().getTenantRole(tenant.name()), cloudTenant.tenantSecretStores()); - var tenantQuota = controller.serviceRegistry().billingController().getQuota(tenant.name()); - var usedQuota = applications.stream() - .map(Application::quotaUsage) - .reduce(QuotaUsage.none, QuotaUsage::add); - - toSlime(tenantQuota, usedQuota, object.setObject("quota")); + try { + var tenantQuota = controller.serviceRegistry().billingController().getQuota(tenant.name()); + var usedQuota = applications.stream() + .map(Application::quotaUsage) + .reduce(QuotaUsage.none, QuotaUsage::add); + + toSlime(tenantQuota, usedQuota, object.setObject("quota")); + } catch (Exception e) { + log.warning(String.format("Failed to get quota for tenant %s: %s", tenant.name(), Exceptions.toMessageString(e))); + } cloudTenant.archiveAccessRole().ifPresent(role -> object.setString("archiveAccessRole", role)); -- cgit v1.2.3