Move RemoteSessionRepo into SessionRepository

4 files changed, 142 insertions, 171 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 77ecf3f7fdd..ab75f64c92c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -298,14 +298,14 @@ public class ApplicationRepositoryTest {
             LocalSession applicationData = tenant.getSessionRepository().getSession(sessionId);
             assertNotNull(applicationData);
             assertNotNull(applicationData.getApplicationId());
-            assertNotNull(tenant.getRemoteSessionRepo().getSession(sessionId));
+            assertNotNull(tenant.getSessionRepo().getRemoteSession(sessionId));
             assertNotNull(applicationRepository.getActiveSession(applicationId()));
 
             // Delete app and verify that it has been deleted from repos and provisioner
             assertTrue(applicationRepository.delete(applicationId()));
             assertNull(applicationRepository.getActiveSession(applicationId()));
             assertNull(tenant.getSessionRepository().getSession(sessionId));
-            assertNull(tenant.getRemoteSessionRepo().getSession(sessionId));
+            assertNull(tenant.getSessionRepo().getRemoteSession(sessionId));
             assertTrue(provisioner.removed);
             assertEquals(tenant.getName(), provisioner.lastApplicationId.tenant());
             assertEquals(applicationId(), provisioner.lastApplicationId);
@@ -346,7 +346,7 @@ public class ApplicationRepositoryTest {
             RemoteSession activeSession = applicationRepository.getActiveSession(applicationId());
             assertNull(activeSession);
             Tenant tenant = tenantRepository.getTenant(applicationId().tenant());
-            assertNull(tenant.getRemoteSessionRepo().getSession(prepareResult.sessionId()));
+            assertNull(tenant.getSessionRepo().getRemoteSession(prepareResult.sessionId()));
 
             assertTrue(applicationRepository.delete(applicationId()));
         }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
index 362b92a8d85..457acf8c376 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
@@ -56,7 +56,7 @@ public class HostHandlerTest {
         TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder()
                 .modelFactoryRegistry(new ModelFactoryRegistry(Collections.singletonList(new VespaModelFactory(new NullConfigModelRegistry()))))
                 .build();
-        tenant.getRemoteSessionRepo().addSession(new RemoteSession(tenant.getName(), sessionId, componentRegistry, new MockSessionZKClient(app)));
+        tenant.getSessionRepo().addRemoteSession(new RemoteSession(tenant.getName(), sessionId, componentRegistry, new MockSessionZKClient(app)));
     }
 
     @Before
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionRepoTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionRepoTest.java
deleted file mode 100644
index 468dd5a15a7..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionRepoTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.config.server.session;
-
-import com.yahoo.config.provision.TenantName;
-import com.yahoo.path.Path;
-import com.yahoo.text.Utf8;
-import com.yahoo.vespa.config.server.TestComponentRegistry;
-import com.yahoo.vespa.config.server.tenant.Tenant;
-import com.yahoo.vespa.config.server.tenant.TenantRepository;
-import com.yahoo.vespa.config.server.zookeeper.ConfigCurator;
-import com.yahoo.vespa.curator.Curator;
-import com.yahoo.vespa.curator.mock.MockCurator;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.function.LongPredicate;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author Ulf Lilleengen
- */
-public class RemoteSessionRepoTest {
-
-    private static final TenantName tenantName = TenantName.defaultName();
-
-    private RemoteSessionRepo remoteSessionRepo;
-    private Curator curator;
-    TenantRepository tenantRepository;
-
-    @Before
-    public void setupFacade() {
-        curator = new MockCurator();
-        TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder()
-                .curator(curator)
-                .build();
-        tenantRepository = new TenantRepository(componentRegistry, false);
-        tenantRepository.addTenant(tenantName);
-        this.remoteSessionRepo = tenantRepository.getTenant(tenantName).getRemoteSessionRepo();
-        curator.create(TenantRepository.getTenantPath(tenantName).append("/applications"));
-        curator.create(TenantRepository.getSessionsPath(tenantName));
-        createSession(1L, false);
-        createSession(2L, false);
-    }
-
-    private void createSession(long sessionId, boolean wait) {
-        createSession(sessionId, wait, tenantName);
-    }
-
-    private void createSession(long sessionId, boolean wait, TenantName tenantName) {
-        Path sessionsPath = TenantRepository.getSessionsPath(tenantName);
-        SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, sessionsPath.append(String.valueOf(sessionId)));
-        zkc.createNewSession(Instant.now());
-        if (wait) {
-            Curator.CompletionWaiter waiter = zkc.getUploadWaiter();
-            waiter.awaitCompletion(Duration.ofSeconds(120));
-        }
-    }
-
-    @Test
-    public void testInitialize() {
-        assertSessionExists(1L);
-        assertSessionExists(2L);
-    }
-
-    @Test
-    public void testCreateSession() {
-        createSession(3L, true);
-        assertSessionExists(3L);
-    }
-
-    @Test
-    public void testSessionStateChange() throws Exception {
-        long sessionId = 3L;
-        createSession(sessionId, true);
-        assertSessionStatus(sessionId, Session.Status.NEW);
-        assertStatusChange(sessionId, Session.Status.PREPARE);
-        assertStatusChange(sessionId, Session.Status.ACTIVATE);
-
-        Path session = TenantRepository.getSessionsPath(tenantName).append("" + sessionId);
-        curator.delete(session);
-        assertSessionRemoved(sessionId);
-        assertNull(remoteSessionRepo.getSession(sessionId));
-    }
-
-    // If reading a session throws an exception it should be handled and not prevent other applications
-    // from loading. In this test we just show that we end up with one session in remote session
-    // repo even if it had bad data (by making getSessionIdForApplication() in FailingTenantApplications
-    // throw an exception).
-    @Test
-    public void testBadApplicationRepoOnActivate() {
-        long sessionId = 3L;
-        TenantName mytenant = TenantName.from("mytenant");
-        curator.set(TenantRepository.getApplicationsPath(mytenant).append("mytenant:appX:default"), new byte[0]); // Invalid data
-        tenantRepository.addTenant(mytenant);
-        Tenant tenant = tenantRepository.getTenant(mytenant);
-        curator.create(TenantRepository.getSessionsPath(mytenant));
-        remoteSessionRepo = tenant.getRemoteSessionRepo();
-        assertThat(remoteSessionRepo.getSessions().size(), is(0));
-        createSession(sessionId, true, mytenant);
-        assertThat(remoteSessionRepo.getSessions().size(), is(1));
-    }
-
-    private void assertStatusChange(long sessionId, Session.Status status) throws Exception {
-        Path statePath = TenantRepository.getSessionsPath(tenantName).append("" + sessionId).append(ConfigCurator.SESSIONSTATE_ZK_SUBPATH);
-        curator.create(statePath);
-        curator.framework().setData().forPath(statePath.getAbsolute(), Utf8.toBytes(status.toString()));
-        assertSessionStatus(sessionId, status);
-    }
-
-    private void assertSessionRemoved(long sessionId) {
-        waitFor(p -> remoteSessionRepo.getSession(sessionId) == null, sessionId);
-        assertNull(remoteSessionRepo.getSession(sessionId));
-    }
-
-    private void assertSessionExists(long sessionId) {
-        assertSessionStatus(sessionId, Session.Status.NEW);
-    }
-
-    private void assertSessionStatus(long sessionId, Session.Status status) {
-        waitFor(p -> remoteSessionRepo.getSession(sessionId) != null &&
-                remoteSessionRepo.getSession(sessionId).getStatus() == status, sessionId);
-        assertNotNull(remoteSessionRepo.getSession(sessionId));
-        assertThat(remoteSessionRepo.getSession(sessionId).getStatus(), is(status));
-    }
-
-    private void waitFor(LongPredicate predicate, long sessionId) {
-        long endTime = System.currentTimeMillis() + 60_000;
-        boolean ok;
-        do {
-            ok = predicate.test(sessionId);
-            try {
-                Thread.sleep(10);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        } while (System.currentTimeMillis() < endTime && !ok);
-    }
-
-}
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
index 1efc0c0cd84..dbd71bed581 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
@@ -5,11 +5,16 @@ import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.io.IOUtils;
+import com.yahoo.text.Utf8;
 import com.yahoo.vespa.config.server.GlobalComponentRegistry;
 import com.yahoo.vespa.config.server.TestComponentRegistry;
 import com.yahoo.vespa.config.server.application.TenantApplications;
 import com.yahoo.vespa.config.server.host.HostRegistry;
 import com.yahoo.vespa.config.server.http.SessionHandlerTest;
+import com.yahoo.vespa.config.server.tenant.Tenant;
+import com.yahoo.vespa.config.server.tenant.TenantRepository;
+import com.yahoo.vespa.config.server.zookeeper.ConfigCurator;
+import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import org.junit.Before;
 import org.junit.Rule;
@@ -19,9 +24,14 @@ import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.function.LongPredicate;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 /**
@@ -30,7 +40,9 @@ import static org.junit.Assert.fail;
 public class SessionRepositoryTest {
 
     private File testApp = new File("src/test/apps/app");
-    private SessionRepository repo;
+    private MockCurator curator;
+    private SessionRepository sessionRepository;
+    private TenantRepository tenantRepository;
     private static final TenantName tenantName = TenantName.defaultName();
 
     @Rule
@@ -49,44 +61,50 @@ public class SessionRepositoryTest {
             IOUtils.copyDirectory(testApp, sessionsPath.resolve("2").toFile());
             IOUtils.copyDirectory(testApp, sessionsPath.resolve("3").toFile());
         }
+        curator = new MockCurator();
+        curator.create(TenantRepository.getTenantPath(tenantName).append("/applications"));
+        curator.create(TenantRepository.getSessionsPath(tenantName));
         GlobalComponentRegistry globalComponentRegistry = new TestComponentRegistry.Builder()
-                .curator(new MockCurator())
+                .curator(curator)
                 .configServerConfig(new ConfigserverConfig.Builder()
                                             .configServerDBDir(configserverDbDir.getAbsolutePath())
                                             .configDefinitionsDir(temporaryFolder.newFolder().getAbsolutePath())
                                             .sessionLifetime(5)
                                             .build())
                 .build();
+        tenantRepository = new TenantRepository(globalComponentRegistry, false);
+        TenantApplications applicationRepo = TenantApplications.create(globalComponentRegistry, tenantName);
         SessionFactory sessionFactory = new SessionFactory(globalComponentRegistry,
-                                                           TenantApplications.create(globalComponentRegistry, tenantName),
+                                                           applicationRepo,
                                                            new HostRegistry<>(),
                                                            tenantName);
-        repo = new SessionRepository(tenantName, globalComponentRegistry, sessionFactory);
+        sessionRepository = new SessionRepository(tenantName, globalComponentRegistry, sessionFactory,
+                                                  applicationRepo, applicationRepo);
     }
 
     @Test
     public void require_that_sessions_can_be_loaded_from_disk() {
-        assertNotNull(repo.getSession(1L));
-        assertNotNull(repo.getSession(2L));
-        assertNotNull(repo.getSession(3L));
-        assertNull(repo.getSession(4L));
+        assertNotNull(sessionRepository.getSession(1L));
+        assertNotNull(sessionRepository.getSession(2L));
+        assertNotNull(sessionRepository.getSession(3L));
+        assertNull(sessionRepository.getSession(4L));
     }
 
     @Test
     public void require_that_all_sessions_are_deleted() {
-        repo.close();
-        assertNull(repo.getSession(1L));
-        assertNull(repo.getSession(2L));
-        assertNull(repo.getSession(3L));
+        sessionRepository.close();
+        assertNull(sessionRepository.getSession(1L));
+        assertNull(sessionRepository.getSession(2L));
+        assertNull(sessionRepository.getSession(3L));
     }
 
     @Test
     public void require_that_sessions_belong_to_a_tenant() {
         // tenant is "default"
-        assertNotNull(repo.getSession(1L));
-        assertNotNull(repo.getSession(2L));
-        assertNotNull(repo.getSession(3L));
-        assertNull(repo.getSession(4L));
+        assertNotNull(sessionRepository.getSession(1L));
+        assertNotNull(sessionRepository.getSession(2L));
+        assertNotNull(sessionRepository.getSession(3L));
+        assertNull(sessionRepository.getSession(4L));
 
         // tenant is "newTenant"
         try {
@@ -94,12 +112,110 @@ public class SessionRepositoryTest {
         } catch (Exception e) {
             fail();
         }
-        assertNull(repo.getSession(1L));
+        assertNull(sessionRepository.getSession(1L));
 
-        repo.addSession(new SessionHandlerTest.MockLocalSession(1L, FilesApplicationPackage.fromFile(testApp)));
-        repo.addSession(new SessionHandlerTest.MockLocalSession(2L, FilesApplicationPackage.fromFile(testApp)));
-        assertNotNull(repo.getSession(1L));
-        assertNotNull(repo.getSession(2L));
-        assertNull(repo.getSession(3L));
+        sessionRepository.addSession(new SessionHandlerTest.MockLocalSession(1L, FilesApplicationPackage.fromFile(testApp)));
+        sessionRepository.addSession(new SessionHandlerTest.MockLocalSession(2L, FilesApplicationPackage.fromFile(testApp)));
+        assertNotNull(sessionRepository.getSession(1L));
+        assertNotNull(sessionRepository.getSession(2L));
+        assertNull(sessionRepository.getSession(3L));
     }
+
+
+    private void createSession(long sessionId, boolean wait) {
+        createSession(sessionId, wait, tenantName);
+    }
+
+    private void createSession(long sessionId, boolean wait, TenantName tenantName) {
+        com.yahoo.path.Path sessionsPath = TenantRepository.getSessionsPath(tenantName);
+        SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, sessionsPath.append(String.valueOf(sessionId)));
+        zkc.createNewSession(Instant.now());
+        if (wait) {
+            Curator.CompletionWaiter waiter = zkc.getUploadWaiter();
+            waiter.awaitCompletion(Duration.ofSeconds(120));
+        }
+    }
+
+    @Test
+    public void testInitialize() {
+        createSession(10L, false);
+        createSession(11L, false);
+        assertSessionExists(10L);
+        assertSessionExists(11L);
+    }
+
+    @Test
+    public void testCreateSession() {
+        createSession(12L, true);
+        assertSessionExists(12L);
+    }
+
+    @Test
+    public void testSessionStateChange() throws Exception {
+        long sessionId = 3L;
+        createSession(sessionId, true);
+        assertSessionStatus(sessionId, Session.Status.NEW);
+        assertStatusChange(sessionId, Session.Status.PREPARE);
+        assertStatusChange(sessionId, Session.Status.ACTIVATE);
+
+        com.yahoo.path.Path session = TenantRepository.getSessionsPath(tenantName).append("" + sessionId);
+        curator.delete(session);
+        assertSessionRemoved(sessionId);
+        assertNull(sessionRepository.getRemoteSession(sessionId));
+    }
+
+    // If reading a session throws an exception it should be handled and not prevent other applications
+    // from loading. In this test we just show that we end up with one session in remote session
+    // repo even if it had bad data (by making getSessionIdForApplication() in FailingTenantApplications
+    // throw an exception).
+    @Test
+    public void testBadApplicationRepoOnActivate() {
+        long sessionId = 3L;
+        TenantName mytenant = TenantName.from("mytenant");
+        curator.set(TenantRepository.getApplicationsPath(mytenant).append("mytenant:appX:default"), new byte[0]); // Invalid data
+        tenantRepository.addTenant(mytenant);
+        Tenant tenant = tenantRepository.getTenant(mytenant);
+        curator.create(TenantRepository.getSessionsPath(mytenant));
+        sessionRepository = tenant.getSessionRepo();
+        assertThat(sessionRepository.getRemoteSessions().size(), is(0));
+        createSession(sessionId, true, mytenant);
+        assertThat(sessionRepository.getRemoteSessions().size(), is(1));
+    }
+
+    private void assertStatusChange(long sessionId, Session.Status status) throws Exception {
+        com.yahoo.path.Path statePath = TenantRepository.getSessionsPath(tenantName).append("" + sessionId).append(ConfigCurator.SESSIONSTATE_ZK_SUBPATH);
+        curator.create(statePath);
+        curator.framework().setData().forPath(statePath.getAbsolute(), Utf8.toBytes(status.toString()));
+        assertSessionStatus(sessionId, status);
+    }
+
+    private void assertSessionRemoved(long sessionId) {
+        waitFor(p -> sessionRepository.getRemoteSession(sessionId) == null, sessionId);
+        assertNull(sessionRepository.getRemoteSession(sessionId));
+    }
+
+    private void assertSessionExists(long sessionId) {
+        assertSessionStatus(sessionId, Session.Status.NEW);
+    }
+
+    private void assertSessionStatus(long sessionId, Session.Status status) {
+        waitFor(p -> sessionRepository.getRemoteSession(sessionId) != null &&
+                     sessionRepository.getRemoteSession(sessionId).getStatus() == status, sessionId);
+        assertNotNull(sessionRepository.getRemoteSession(sessionId));
+        assertThat(sessionRepository.getRemoteSession(sessionId).getStatus(), is(status));
+    }
+
+    private void waitFor(LongPredicate predicate, long sessionId) {
+        long endTime = System.currentTimeMillis() + 60_000;
+        boolean ok;
+        do {
+            ok = predicate.test(sessionId);
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        } while (System.currentTimeMillis() < endTime && !ok);
+    }
+
 }