aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-07-03 07:45:49 +0200
committerHarald Musum <musum@verizonmedia.com>2020-07-03 07:45:49 +0200
commitb29fb812be8cde17bb88dff266899eaa76535959 (patch)
tree914b45b0b77250950361b2dc1e6d270c2b949409 /configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
parentcb9dd27481a9a4cd1f3cbef50ce9670f39985c0f (diff)
Remove ReloadHandler interface
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java6
1 files changed, 3 insertions, 3 deletions
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 763c77f2088..66ed721a3e1 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
@@ -8,8 +8,8 @@ import com.yahoo.config.provision.TenantName;
import com.yahoo.lang.SettableOptional;
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;
+import com.yahoo.vespa.config.server.application.TenantApplications;
import com.yahoo.vespa.config.server.modelfactory.ActivatedModelsBuilder;
import com.yahoo.vespa.curator.Curator;
import org.apache.zookeeper.KeeperException;
@@ -81,12 +81,12 @@ public class RemoteSession extends Session {
return sessionZooKeeperClient.createWriteStatusTransaction(Status.DELETE);
}
- void makeActive(ReloadHandler reloadHandler) {
+ void makeActive(TenantApplications tenantApplications) {
Curator.CompletionWaiter waiter = sessionZooKeeperClient.getActiveWaiter();
log.log(Level.FINE, () -> logPre() + "Getting session from repo: " + getSessionId());
ApplicationSet app = ensureApplicationLoaded();
log.log(Level.FINE, () -> logPre() + "Reloading config for " + getSessionId());
- reloadHandler.reloadConfig(app);
+ tenantApplications.reloadConfig(app);
log.log(Level.FINE, () -> logPre() + "Notifying " + waiter);
notifyCompletion(waiter);
log.log(Level.INFO, logPre() + "Session activated: " + getSessionId());