diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-03-25 13:48:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-25 13:48:00 +0100 |
commit | 1912a6747c73ffd0ce750f7db94c23d095248c38 (patch) | |
tree | e7414016b3e4e12cdf449afcd8825509efe49e5b /controller-server | |
parent | a9c2fe028dbec15644923a9de800320c15b90579 (diff) | |
parent | 0f04eb9c779033be459f5447af64e085f63e5be4 (diff) |
Merge pull request #17174 from vespa-engine/jonmv/apache-hc5-client
Jonmv/apache hc5 client
Diffstat (limited to 'controller-server')
4 files changed, 3 insertions, 18 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index dddb9ff0b7b..8de50aa348a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -32,7 +32,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.billing.Quota; import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateMetadata; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ApplicationReindexing; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServer; -import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ContainerEndpoint; import com.yahoo.vespa.hosted.controller.api.integration.configserver.Log; import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node; @@ -656,15 +655,7 @@ public class ApplicationController { * Not in a state where it should receive traffic. */ public boolean isSuspended(DeploymentId deploymentId) { - try { - return configServer.isSuspended(deploymentId); - } - catch (ConfigServerException e) { - if (e.getErrorCode() == ConfigServerException.ErrorCode.NOT_FOUND) - return false; // If the application wasn't found, it's not suspended. - - throw e; - } + return configServer.isSuspended(deploymentId); } /** Sets suspension status of the given deployment in its zone. */ 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 d3992290f20..fdd0e02e2ec 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 @@ -71,12 +71,6 @@ public class TenantController { .collect(Collectors.toList()); } - // TODO jonmv: Remove. - /** Returns the list of tenants accessible to the given user. */ - public List<Tenant> asList(Credentials credentials) { - return ((AthenzFacade) accessControl).accessibleTenants(asList(), credentials); - } - /** Locks a tenant for modification and applies the given action. */ public <T extends LockedTenant> void lockIfPresent(TenantName name, Class<T> token, Consumer<T> action) { try (Lock lock = lock(name)) { 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 81183ac9aca..a7b872630e7 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 @@ -939,7 +939,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { jsonObject.set("metrics", jsonArray); return new JsonResponse(200, jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObject)); } catch (JsonProcessingException e) { - log.log(Level.SEVERE, "Unable to build JsonResponse with Proton data: " + e.getMessage(), e); + log.log(Level.WARNING, "Unable to build JsonResponse with Proton data: " + e.getMessage(), e); return new JsonResponse(500, ""); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/AthenzCredentials.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/AthenzCredentials.java index ebdb70e2c6c..ae7358e74f8 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/AthenzCredentials.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/AthenzCredentials.java @@ -38,7 +38,7 @@ public class AthenzCredentials extends Credentials { /** Returns the Okta access token required for Athenz tenancy operation */ public OktaAccessToken accessToken() { return accessToken; } - /** /** Returns the Okta identity token required for Athenz tenancy operation */ + /** Returns the Okta identity token required for Athenz tenancy operation */ public OktaIdentityToken identityToken() { return identityToken; } |