Use SessionZooKeeperClient instance in superclass

3 files changed, 34 insertions, 36 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
index 56e32f7d802..683f763ecaf 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
@@ -39,7 +39,6 @@ public class LocalSession extends Session {
     private final TenantApplications applicationRepo;
     private final SessionPreparer sessionPreparer;
     private final File serverDBSessionDir;
-    private final SessionZooKeeperClient sessionZooKeeperClient;
     private final HostValidator<ApplicationId> hostValidator;
 
     /**
@@ -54,7 +53,6 @@ public class LocalSession extends Session {
         super(tenant, sessionId, sessionZooKeeperClient);
         this.serverDBSessionDir = serverDBSessionDir;
         this.applicationPackage = applicationPackage;
-        this.sessionZooKeeperClient = sessionZooKeeperClient;
         this.applicationRepo = applicationRepo;
         this.sessionPreparer = sessionPreparer;
         this.hostValidator = hostValidator;
@@ -67,7 +65,7 @@ public class LocalSession extends Session {
                                        Instant now) {
         applicationRepo.createApplication(params.getApplicationId()); // TODO jvenstad: This is wrong, but it has to be done now, since preparation can change the application ID of a session :(
         logger.log(Level.FINE, "Created application " + params.getApplicationId());
-        Curator.CompletionWaiter waiter = zooKeeperClient.createPrepareWaiter();
+        Curator.CompletionWaiter waiter = sessionZooKeeperClient.createPrepareWaiter();
         ConfigChangeActions actions = sessionPreparer.prepare(hostValidator, logger, params,
                                                               currentActiveApplicationSet, tenantPath, now,
                                                               serverDBSessionDir, applicationPackage, sessionZooKeeperClient);
@@ -88,17 +86,17 @@ public class LocalSession extends Session {
     }
 
     private Transaction createSetStatusTransaction(Status status) {
-        return zooKeeperClient.createWriteStatusTransaction(status);
+        return sessionZooKeeperClient.createWriteStatusTransaction(status);
     }
 
     private void setStatus(Session.Status newStatus) {
-        zooKeeperClient.writeStatus(newStatus);
+        sessionZooKeeperClient.writeStatus(newStatus);
     }
 
     public Transaction createActivateTransaction() {
-        zooKeeperClient.createActiveWaiter();
+        sessionZooKeeperClient.createActiveWaiter();
         Transaction transaction = createSetStatusTransaction(Status.ACTIVATE);
-        transaction.add(applicationRepo.createPutTransaction(zooKeeperClient.readApplicationId(), getSessionId()).operations());
+        transaction.add(applicationRepo.createPutTransaction(sessionZooKeeperClient.readApplicationId(), getSessionId()).operations());
         return transaction;
     }
 
@@ -112,12 +110,12 @@ public class LocalSession extends Session {
 
     /** Add transactions to delete this session to the given nested transaction */
     public void delete(NestedTransaction transaction) {
-        transaction.add(zooKeeperClient.deleteTransaction(), FileTransaction.class);
+        transaction.add(sessionZooKeeperClient.deleteTransaction(), FileTransaction.class);
         transaction.add(FileTransaction.from(FileOperations.delete(serverDBSessionDir.getAbsolutePath())));
     }
 
     public void waitUntilActivated(TimeoutBudget timeoutBudget) {
-        zooKeeperClient.getActiveWaiter().awaitCompletion(timeoutBudget.timeLeft());
+        sessionZooKeeperClient.getActiveWaiter().awaitCompletion(timeoutBudget.timeLeft());
     }
 
     public enum Mode {
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 c1179a2dd17..763c77f2088 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
@@ -50,20 +50,20 @@ public class RemoteSession extends Session {
     }
 
     void loadPrepared() {
-        Curator.CompletionWaiter waiter = zooKeeperClient.getPrepareWaiter();
+        Curator.CompletionWaiter waiter = sessionZooKeeperClient.getPrepareWaiter();
         ensureApplicationLoaded();
         notifyCompletion(waiter);
     }
 
     private ApplicationSet loadApplication() {
-        ApplicationPackage applicationPackage = zooKeeperClient.loadApplicationPackage();
+        ApplicationPackage applicationPackage = sessionZooKeeperClient.loadApplicationPackage();
 
         // Read hosts allocated on the config server instance which created this
         Optional<AllocatedHosts> allocatedHosts = applicationPackage.getAllocatedHosts();
 
-        return ApplicationSet.fromList(applicationLoader.buildModels(zooKeeperClient.readApplicationId(),
-                                                                     zooKeeperClient.readDockerImageRepository(),
-                                                                     zooKeeperClient.readVespaVersion(),
+        return ApplicationSet.fromList(applicationLoader.buildModels(sessionZooKeeperClient.readApplicationId(),
+                                                                     sessionZooKeeperClient.readDockerImageRepository(),
+                                                                     sessionZooKeeperClient.readVespaVersion(),
                                                                      applicationPackage,
                                                                      new SettableOptional<>(allocatedHosts),
                                                                      clock.instant()));
@@ -78,11 +78,11 @@ public class RemoteSession extends Session {
     }
 
     public Transaction createDeleteTransaction() {
-        return zooKeeperClient.createWriteStatusTransaction(Status.DELETE);
+        return sessionZooKeeperClient.createWriteStatusTransaction(Status.DELETE);
     }
 
     void makeActive(ReloadHandler reloadHandler) {
-        Curator.CompletionWaiter waiter = zooKeeperClient.getActiveWaiter();
+        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());
@@ -93,7 +93,7 @@ public class RemoteSession extends Session {
     }
     
     void confirmUpload() {
-        Curator.CompletionWaiter waiter = zooKeeperClient.getUploadWaiter();
+        Curator.CompletionWaiter waiter = sessionZooKeeperClient.getUploadWaiter();
         log.log(Level.FINE, "Notifying upload waiter for session " + getSessionId());
         notifyCompletion(waiter);
         log.log(Level.FINE, "Done notifying upload for session " + getSessionId());
@@ -116,13 +116,13 @@ public class RemoteSession extends Session {
     }
 
     public void delete() {
-        Transaction transaction = zooKeeperClient.deleteTransaction();
+        Transaction transaction = sessionZooKeeperClient.deleteTransaction();
         transaction.commit();
         transaction.close();
     }
 
     public ApplicationMetaData getMetaData() {
-        return zooKeeperClient.loadApplicationPackage().getMetaData();
+        return sessionZooKeeperClient.loadApplicationPackage().getMetaData();
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
index c553133ba12..1e832548342 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
@@ -25,12 +25,12 @@ public abstract class Session implements Comparable<Session>  {
 
     private final long sessionId;
     protected final TenantName tenant;
-    protected final SessionZooKeeperClient zooKeeperClient;
+    protected final SessionZooKeeperClient sessionZooKeeperClient;
 
-    protected Session(TenantName tenant, long sessionId, SessionZooKeeperClient zooKeeperClient) {
+    protected Session(TenantName tenant, long sessionId, SessionZooKeeperClient sessionZooKeeperClient) {
         this.tenant = tenant;
         this.sessionId = sessionId;
-        this.zooKeeperClient = zooKeeperClient;
+        this.sessionZooKeeperClient = sessionZooKeeperClient;
     }
     /**
      * Retrieve the session id for this session.
@@ -41,7 +41,7 @@ public abstract class Session implements Comparable<Session>  {
     }
 
     public Session.Status getStatus() {
-        return zooKeeperClient.readStatus();
+        return sessionZooKeeperClient.readStatus();
     }
 
     @Override
@@ -80,43 +80,43 @@ public abstract class Session implements Comparable<Session>  {
     }
 
     public Instant getCreateTime() {
-        return zooKeeperClient.readCreateTime();
+        return sessionZooKeeperClient.readCreateTime();
     }
 
     public void setApplicationId(ApplicationId applicationId) {
-        zooKeeperClient.writeApplicationId(applicationId);
+        sessionZooKeeperClient.writeApplicationId(applicationId);
     }
 
     void setApplicationPackageReference(FileReference applicationPackageReference) {
         if (applicationPackageReference == null) throw new IllegalArgumentException(String.format(
                 "Null application package FileReference for tenant: %s, session: %d", tenant, sessionId));
-        zooKeeperClient.writeApplicationPackageReference(applicationPackageReference);
+        sessionZooKeeperClient.writeApplicationPackageReference(applicationPackageReference);
     }
 
     public void setVespaVersion(Version version) {
-        zooKeeperClient.writeVespaVersion(version);
+        sessionZooKeeperClient.writeVespaVersion(version);
     }
 
     public void setDockerImageRepository(Optional<DockerImage> dockerImageRepository) {
-        zooKeeperClient.writeDockerImageRepository(dockerImageRepository);
+        sessionZooKeeperClient.writeDockerImageRepository(dockerImageRepository);
     }
 
     public void setAthenzDomain(Optional<AthenzDomain> athenzDomain) {
-        zooKeeperClient.writeAthenzDomain(athenzDomain);
+        sessionZooKeeperClient.writeAthenzDomain(athenzDomain);
     }
 
-    public ApplicationId getApplicationId() { return zooKeeperClient.readApplicationId(); }
+    public ApplicationId getApplicationId() { return sessionZooKeeperClient.readApplicationId(); }
 
-    public FileReference getApplicationPackageReference() {return zooKeeperClient.readApplicationPackageReference(); }
+    public FileReference getApplicationPackageReference() {return sessionZooKeeperClient.readApplicationPackageReference(); }
 
-    public Optional<DockerImage> getDockerImageRepository() { return zooKeeperClient.readDockerImageRepository(); }
+    public Optional<DockerImage> getDockerImageRepository() { return sessionZooKeeperClient.readDockerImageRepository(); }
 
-    public Version getVespaVersion() { return zooKeeperClient.readVespaVersion(); }
+    public Version getVespaVersion() { return sessionZooKeeperClient.readVespaVersion(); }
 
-    public Optional<AthenzDomain> getAthenzDomain() { return zooKeeperClient.readAthenzDomain(); }
+    public Optional<AthenzDomain> getAthenzDomain() { return sessionZooKeeperClient.readAthenzDomain(); }
 
     public AllocatedHosts getAllocatedHosts() {
-        return zooKeeperClient.getAllocatedHosts();
+        return sessionZooKeeperClient.getAllocatedHosts();
     }
 
     public Transaction createDeactivateTransaction() {
@@ -124,7 +124,7 @@ public abstract class Session implements Comparable<Session>  {
     }
 
     private Transaction createSetStatusTransaction(Status status) {
-        return zooKeeperClient.createWriteStatusTransaction(status);
+        return sessionZooKeeperClient.createWriteStatusTransaction(status);
     }
 
     // Note: Assumes monotonically increasing session ids