Refactor finding db with role.

neo4j · Mar 14, 2016 · a3fba8f · a3fba8f
1 parent 067d879
commit a3fba8f
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 29 deletions.
diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java
@@ -350,33 +350,38 @@ public GraphDatabaseService findAnEdgeServer()
         return edgeServers.iterator().next();
     }
 
-    public CoreGraphDatabase getLeader()
+    public CoreGraphDatabase getDbWithRole( Role role )
     {
         for ( CoreGraphDatabase coreServer : coreServers )
         {
-            if ( coreServer.getRole().equals( Role.LEADER ) )
+            if ( coreServer.getRole().equals( role ) )
             {
                 return coreServer;
             }
         }
         return null;
     }
 
-    public CoreGraphDatabase findLeader( long leaderWaitTimeout ) throws NoLeaderFoundException
+    public CoreGraphDatabase awaitLeader( long timeoutMillis ) throws TimeoutException
     {
-        long leaderWaitEndTime = leaderWaitTimeout + System.currentTimeMillis();
+        return awaitCoreGraphDatabaseWithRole( timeoutMillis, Role.LEADER );
-        CoreGraphDatabase leader;
+    }
-        while ( (leader = getLeader()) == null && (System.currentTimeMillis() < leaderWaitEndTime) )
+
+    public CoreGraphDatabase awaitCoreGraphDatabaseWithRole( long timeoutMillis, Role role ) throws TimeoutException
+    {
+        long endTimeMillis = timeoutMillis + System.currentTimeMillis();
+
+        CoreGraphDatabase db;
+        while ( (db = getDbWithRole( role ) ) == null && (System.currentTimeMillis() < endTimeMillis) )
         {
-            LockSupport.parkNanos( MILLISECONDS.toNanos( 1000 ) );
+            LockSupport.parkNanos( MILLISECONDS.toNanos( 100 ) );
         }
 
-        if ( leader == null )
+        if ( db == null )
         {
-            throw new NoLeaderFoundException();
+            throw new TimeoutException();
         }
-
+        return db;
-        return leader;
     }
 
     public int numberOfCoreServers()

diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java
@@ -27,6 +27,7 @@
 import org.junit.Test;
 
 import org.neo4j.coreedge.discovery.Cluster;
+import org.neo4j.coreedge.raft.roles.Role;
 import org.neo4j.coreedge.server.core.CoreGraphDatabase;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.test.TargetDirectory;
@@ -83,7 +84,7 @@ public void shouldBeAbleToAddAndRemoveCoreServersUnderModestLoad() throws Except
 
         ExecutorService executorService = Executors.newSingleThreadExecutor();
         executorService.submit( (Runnable) () -> {
-            CoreGraphDatabase leader = cluster.getLeader();
+            CoreGraphDatabase leader = cluster.getDbWithRole( Role.LEADER );
             try ( Transaction tx = leader.beginTx() )
             {
                 leader.createNode();
@@ -137,4 +138,4 @@ public void shouldBeAbleToRestartTheCluster() throws Exception
 
         assertEquals( 3, cluster.numberOfCoreServers() );
     }
-}
+}
diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConcurrentLockingIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConcurrentLockingIT.java
@@ -155,7 +155,7 @@ public Long call() throws Exception
 
     public void createNodes( long nodeCount ) throws Exception
     {
-        GraphDatabaseService coreServer = cluster.findLeader( 5000 );
+        GraphDatabaseService coreServer = cluster.awaitLeader( 5000 );
         try ( Transaction tx = coreServer.beginTx() )
         {
             for ( int i = 0; i < nodeCount; i++ )

diff --git a/...prise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java b/...prise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java
@@ -83,7 +83,7 @@ public void shouldReplicateTransactionToCoreServers() throws Throwable
         cluster = Cluster.start( dbDir, 3, 0 );
 
         // when
-        GraphDatabaseService coreDB = cluster.findLeader( 5000 );
+        GraphDatabaseService coreDB = cluster.awaitLeader( 5000 );
 
         try ( Transaction tx = coreDB.beginTx() )
         {

diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreServerReplicationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreServerReplicationIT.java
@@ -76,6 +76,7 @@ public void shutdown()
         if ( cluster != null )
         {
             cluster.shutdown();
+            cluster = null;
         }
     }
 
@@ -87,7 +88,7 @@ public void shouldReplicateTransactionToCoreServers() throws Exception
         cluster = Cluster.start( dbDir, 3, 0 );
 
         // when
-        GraphDatabaseService coreDB = cluster.findLeader( 5000 );
+        GraphDatabaseService coreDB = cluster.awaitLeader( 5000 );
 
         try ( Transaction tx = coreDB.beginTx() )
         {
@@ -134,7 +135,7 @@ public void shouldReplicateTransactionToCoreServersAddedAfterInitialStartUp() th
         cluster.addCoreServerWithServerId( 3, 4 );
 
         // when
-        GraphDatabaseService coreDB = cluster.findLeader( 5000 );
+        GraphDatabaseService coreDB = cluster.awaitLeader( 5000 );
 
         try ( Transaction tx = coreDB.beginTx() )
         {
@@ -145,7 +146,7 @@ public void shouldReplicateTransactionToCoreServersAddedAfterInitialStartUp() th
 
         cluster.addCoreServerWithServerId( 4, 5 );
 
-        coreDB = cluster.findLeader( 5000 );
+        coreDB = cluster.awaitLeader( 5000 );
 
         try ( Transaction tx = coreDB.beginTx() )
         {
@@ -181,7 +182,7 @@ public void shouldReplicateTransactionAfterOneOriginalServerRemovedFromCluster()
     {
         File dbDir = dir.directory();
         cluster = Cluster.start( dbDir, 3, 0 );
-        CoreGraphDatabase leader = cluster.findLeader( 5000 );
+        CoreGraphDatabase leader = cluster.awaitLeader( 5000 );
         try ( Transaction tx = leader.beginTx() )
         {
             Node node = leader.createNode();
@@ -190,7 +191,7 @@ public void shouldReplicateTransactionAfterOneOriginalServerRemovedFromCluster()
         }
 
         cluster.removeCoreServer( leader );
-        final GraphDatabaseService newLeader = cluster.findLeader( 5000 );
+        final GraphDatabaseService newLeader = cluster.awaitLeader( 5000 );
         ThrowingSupplier<Boolean, Exception> creationSuccess = () -> {
             try ( Transaction tx = newLeader.beginTx() )
             {
@@ -241,7 +242,7 @@ public void shouldReplicateToCoreServersAddedAfterInitialTransactions() throws E
         // when
         for ( int i = 0; i < 15; i++ )
         {
-            CoreGraphDatabase leader = cluster.findLeader( 5000 );
+            CoreGraphDatabase leader = cluster.awaitLeader( 5000 );
 
             try ( Transaction tx = leader.beginTx() )
             {

diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java
@@ -19,15 +19,15 @@
  */
 package org.neo4j.coreedge.scenarios;
 
+import java.io.File;
+import java.util.Set;
+import java.util.concurrent.TimeoutException;
+
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 
-import java.io.File;
-import java.util.Set;
-
 import org.neo4j.coreedge.discovery.Cluster;
-import org.neo4j.coreedge.raft.NoLeaderFoundException;
 import org.neo4j.coreedge.server.core.CoreGraphDatabase;
 import org.neo4j.coreedge.server.edge.EdgeGraphDatabase;
 import org.neo4j.function.ThrowingSupplier;
@@ -43,10 +43,12 @@
 import static java.io.File.pathSeparator;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
+
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
 import static org.neo4j.helpers.collection.Iterables.count;
 import static org.neo4j.test.Assert.assertEventually;
 
@@ -204,12 +206,12 @@ private File createExistingEdgeStore( String path )
         return dir;
     }
 
-    private GraphDatabaseService executeOnLeaderWithRetry( Workload workload ) throws NoLeaderFoundException
+    private GraphDatabaseService executeOnLeaderWithRetry( Workload workload ) throws TimeoutException
     {
         CoreGraphDatabase coreDB;
         while ( true )
         {
-            coreDB = cluster.findLeader( 5000 );
+            coreDB = cluster.awaitLeader( 5000 );
             try ( Transaction tx = coreDB.beginTx() )
             {
                 workload.doWork( coreDB );

diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RestartIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RestartIT.java
@@ -134,7 +134,7 @@ public void edgeTest() throws Exception
         cluster = Cluster.start( dbDir, 2, 1 );
 
         // when
-        final GraphDatabaseService coreDB = cluster.findLeader( 5000 );
+        final GraphDatabaseService coreDB = cluster.awaitLeader( 5000 );
 
         try ( Transaction tx = coreDB.beginTx() )
         {

diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java
@@ -78,7 +78,7 @@ public void shouldMonitorCoreEdge() throws Exception
         cluster = Cluster.start( dbDir, 3, 1 );
 
         // when
-        GraphDatabaseService coreDB = cluster.findLeader( 5000 );
+        GraphDatabaseService coreDB = cluster.awaitLeader( 5000 );
 
         try ( Transaction tx = coreDB.beginTx() )
         {