summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2021-11-11 15:09:54 +0100
committerGitHub <noreply@github.com>2021-11-11 15:09:54 +0100
commitb91142792f9fda86eeb0b2c40337df6a0aa2c905 (patch)
tree7d5134a00cb568f3afed5fddb11691456d8f4fa1 /controller-server
parent9c5c41e68a5b3166c4d0d8cac98ac5763957878a (diff)
parentabc27941e92fd1c4740e0c857d0cad62c5dfcb39 (diff)
Merge pull request #19976 from vespa-engine/olaa/delete-unexpected-roles
Delete unexpected roles
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
index 870e3af678f..5f6f917bc75 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
@@ -36,11 +36,8 @@ public class UserManagementMaintainer extends ControllerMaintainer {
@Override
protected double maintain() {
findLeftoverRoles().forEach(role -> {
- /*
- Log discrepancy now
- TODO: userManagement.deleteRole(role);
- */
- logger.warning(String.format("Found unexpected role %s - Please investigate", role.toString()));
+ logger.warning(String.format("Found unexpected %s - Deleting", role.toString()));
+ userManagement.deleteRole(role);
});
return 1.0;
}