From b29fb812be8cde17bb88dff266899eaa76535959 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 3 Jul 2020 07:45:49 +0200 Subject: Remove ReloadHandler interface --- .../java/com/yahoo/vespa/config/server/session/RemoteSession.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java') 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()); -- cgit v1.2.3