summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2022-12-13 11:38:15 +0100
committerGitHub <noreply@github.com>2022-12-13 11:38:15 +0100
commitf64915a9b1128f96b281ae026ad1140e0a8672c3 (patch)
treefa36bde671df14b734b3b42a4a2a707bc05ad1ee
parentbb4a0af717de597b7cce4907276ea4c8069a7da8 (diff)
parent0faf8fa17d3814ef25d67534ce27050bb9c81dec (diff)
Merge pull request #25231 from vespa-engine/hmusum/reduce-logging
Remove unnecessary and noisy logging
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java19
1 files changed, 6 insertions, 13 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 25de283ad3a..f15ab6c7370 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -653,21 +653,13 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
}
private Application getApplication(ApplicationId applicationId, Optional<Version> version) {
- try {
- Tenant tenant = getTenant(applicationId);
- if (tenant == null) throw new NotFoundException("Tenant '" + applicationId.tenant() + "' not found");
+ Tenant tenant = getTenant(applicationId);
+ if (tenant == null) throw new NotFoundException("Tenant '" + applicationId.tenant() + "' not found");
- Optional<ApplicationSet> activeApplicationSet = tenant.getSessionRepository().getActiveApplicationSet(applicationId);
- if (activeApplicationSet.isEmpty()) throw new NotFoundException("Unknown application id '" + applicationId + "'");
+ Optional<ApplicationSet> activeApplicationSet = tenant.getSessionRepository().getActiveApplicationSet(applicationId);
+ if (activeApplicationSet.isEmpty()) throw new NotFoundException("Unknown application id '" + applicationId + "'");
- return activeApplicationSet.get().getForVersionOrLatest(version, clock.instant());
- } catch (NotFoundException e) {
- log.log(Level.WARNING, "Failed getting application for '" + applicationId + "': " + e.getMessage());
- throw e;
- } catch (Exception e) {
- log.log(Level.WARNING, "Failed getting application for '" + applicationId + "'", e);
- throw e;
- }
+ return activeApplicationSet.get().getForVersionOrLatest(version, clock.instant());
}
// Will return Optional.empty() if getting application fails (instead of throwing an exception)
@@ -940,6 +932,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
private List<ApplicationId> activeApplications(TenantName tenantName) {
return tenantRepository.getTenant(tenantName).getApplicationRepo().activeApplications();
}
+
// ---------------- Proton Metrics V1 ------------------------------------------------------------------------
public ProtonMetricsResponse getProtonMetrics(ApplicationId applicationId) {