summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@verizonmedia.com>2021-09-06 13:23:44 +0200
committerGitHub <noreply@github.com>2021-09-06 13:23:44 +0200
commit68dfecca5a3baeb118c65e2dfaf7ff3284179f42 (patch)
treee66dc0270da015ef71ce94e0e3379b235d30e11e /controller-server
parent9c939c04b9b2ec4ed2d74c33ebc580ff81198e60 (diff)
delay tenant role creation until after tenant creation (#18975)
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
index 047738784b7..8ff68c4cba5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
@@ -114,11 +114,7 @@ public class TenantController {
TenantId.validate(tenantSpec.tenant().value());
curator.writeTenant(accessControl.createTenant(tenantSpec, controller.clock().instant(), credentials, asList()));
- try {
- controller.serviceRegistry().roleService().createTenantRole(tenantSpec.tenant());
- } catch (Exception e) {
- throw new RuntimeException("Unable to create tenant role for tenant: " + tenantSpec.tenant());
- }
+ // We should create tenant roles here but it takes too long - assuming the TenantRoleMaintainer will do it Soon™
}
}