Various cleanup, non-functional

9 files changed, 13 insertions, 31 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 6eaefe4c82b..bea087f6ae9 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
@@ -54,6 +54,7 @@ import com.yahoo.vespa.config.server.session.SilentDeployLogger;
 import com.yahoo.vespa.config.server.tenant.Rotations;
 import com.yahoo.vespa.config.server.tenant.Tenant;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
+import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.orchestrator.Orchestrator;
 
 import java.io.File;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index 92add4d053b..348e8f1cafc 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -59,11 +59,7 @@ public class TenantApplications {
     }
 
     public static TenantApplications create(Curator curator, ReloadHandler reloadHandler, TenantName tenant) {
-        try {
-            return new TenantApplications(curator, TenantRepository.getApplicationsPath(tenant), reloadHandler, tenant);
-        } catch (Exception e) {
-            throw new RuntimeException(TenantRepository.logPre(tenant) + "Error creating application repo", e);
-        }
+        return new TenantApplications(curator, TenantRepository.getApplicationsPath(tenant), reloadHandler, tenant);
     }
 
     /**
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index 082be2583c2..01bb4e2dc76 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -115,7 +115,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
     /** Activates this. If it is not already prepared, this will call prepare first. */
     @Override
     public void activate() {
-        if (! prepared)
+        if ( ! prepared)
             prepare();
 
         TimeoutBudget timeoutBudget = new TimeoutBudget(clock, timeout);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java
index 77572856ff5..a7f8b8164a5 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java
@@ -36,6 +36,7 @@ public class HostRegistry<T> implements HostValidator<T> {
         addHosts(key, newHosts);
     }
 
+    @Override
     public synchronized void verifyHosts(T key, Collection<String> newHosts) {
         for (String host : newHosts) {
             if (hostAlreadyTaken(host, key)) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
index 61f5e4f1230..c45513e3a07 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
@@ -5,8 +5,8 @@ import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.lang.SettableOptional;
-import com.yahoo.transaction.Transaction;
 import com.yahoo.log.LogLevel;
+import com.yahoo.transaction.Transaction;
 import com.yahoo.vespa.config.server.GlobalComponentRegistry;
 import com.yahoo.vespa.config.server.ReloadHandler;
 import com.yahoo.vespa.config.server.application.ApplicationSet;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
index ccd5684b9ff..d0de3046f5b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
@@ -115,19 +115,6 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> {
         return (created.plus(expiryTime).isBefore(Instant.now()));
     }
 
-    private void loadActiveSession(RemoteSession session) {
-        tryReload(session.ensureApplicationLoaded(), session.logPre());
-    }
-
-    private void tryReload(ApplicationSet applicationSet, String logPre) {
-        try {
-            reloadHandler.reloadConfig(applicationSet);
-            log.log(LogLevel.INFO, logPre + "Application activated successfully: " + applicationSet.getId());
-        } catch (Exception e) {
-            log.log(LogLevel.WARNING, logPre + "Skipping loading of application '" + applicationSet.getId() + "': " + Exceptions.toMessageString(e));
-        }
-    }
-
     private List<Long> getSessionListFromDirectoryCache(List<ChildData> children) {
         return getSessionList(children.stream()
                                       .map(child -> Path.fromString(child.getPath()).getName())
@@ -194,11 +181,12 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> {
             try {
                 if (applicationRepo.requireActiveSessionOf(applicationId) == session.getSessionId()) {
                     log.log(LogLevel.DEBUG, "Found active application for session " + session.getSessionId() + " , loading it");
-                    loadActiveSession(session);
-                    break;
+                    reloadHandler.reloadConfig(session.ensureApplicationLoaded());
+                    log.log(LogLevel.INFO, session.logPre() + "Application activated successfully: " + applicationId);
+                    return;
                 }
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, session.logPre() + " error reading session id for " + applicationId, e);
+                log.log(LogLevel.WARNING, session.logPre() + "Skipping loading of application '" + applicationId + "': " + Exceptions.toMessageString(e));
             }
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 43a5ff6d0c2..f0ceeb186fe 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -113,9 +113,8 @@ public class SessionPreparer {
             log.log(LogLevel.DEBUG, () -> "time used " + params.getTimeoutBudget().timesUsed() +
                     " : " + params.getApplicationId());
             return preparation.result();
-        } catch (OutOfCapacityException e) {
-            throw e;
-        } catch (IllegalArgumentException e) {
+        }
+        catch (IllegalArgumentException e) {
             throw new InvalidApplicationException("Invalid application package", e);
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
index 078b6e861a9..3f462a9ed9e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
@@ -164,9 +164,5 @@ public class TenantBuilder {
         }
     }
 
-    public TenantApplications getApplicationRepo() {
-        return applicationRepo;
-    }
-
     public TenantName getTenantName() { return tenant; }
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
index f72adcd94dc..16b3b76210c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
@@ -93,6 +93,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
      *
      * @param applicationSet the {@link ApplicationSet} to be reloaded
      */
+    @Override
     public void reloadConfig(ApplicationSet applicationSet) {
         setLiveApp(applicationSet);
         notifyReloadListeners(applicationSet);
@@ -112,7 +113,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
     @Override
     public void removeApplicationsExcept(Set<ApplicationId> applications) {
         for (ApplicationId activeApplication : applicationMapper.listApplicationIds()) {
-            if (! applications.contains(activeApplication)) {
+            if ( ! applications.contains(activeApplication)) {
                 log.log(LogLevel.INFO, "Will remove deleted application " + activeApplication.toShortString());
                 removeApplication(activeApplication);
             }