Better handling of cluster startup failures

And couple small cleanups.

Author: lutovich

driver/src/test/java/org/neo4j/driver/v1/util/cc/Cluster.java

@@ -72,7 +72,7 @@ public Path getPath()
         return path;
     }
 
-    public void cleanUp()
+    public void deleteData()
     {
         leaderTx( new Consumer<Session>()
         {
@@ -142,8 +142,8 @@ private Set<ClusterMember> membersWithRole( ClusterMemberRole role )
         try ( Driver driver = createDriver( members, password );
               Session session = driver.session( AccessMode.READ ) )
         {
-            StatementResult result = session.run( "call dbms.cluster.overview()" );
-            for ( Record record : result.list() )
+            List<Record> records = findClusterOverview( session );
+            for ( Record record : records )
             {
                 if ( role == extractRole( record ) )
                 {
@@ -185,8 +185,8 @@ private static Set<ClusterMember> waitForMembers( Set<ClusterMember> members, St
 
                 try ( Session session = driver.session( AccessMode.READ ) )
                 {
-                    StatementResult result = session.run( "call dbms.cluster.overview()" );
-                    for ( Record record : result.list() )
+                    List<Record> records = findClusterOverview( session );
+                    for ( Record record : records )
                     {
                         URI boltUri = extractBoltUri( record );
 
@@ -230,16 +230,16 @@ private static Driver createDriver( Set<ClusterMember> members, String password
         throw new IllegalStateException( "No core members found among: " + members );
     }
 
-    private static Driver createDriver( URI boltUri, String password )
+    private static List<Record> findClusterOverview( Session session )
     {
-        return GraphDatabase.driver( boltUri, AuthTokens.basic( ADMIN_USER, password ), driverConfig() );
+        StatementResult result = session.run( "call dbms.cluster.overview" );
+        return result.list();
     }
 
     private static boolean isCoreMember( Session session )
     {
         Record record = single( session.run( "call dbms.cluster.role" ).list() );
-        String roleName = record.get( "role" ).asString();
-        ClusterMemberRole role = ClusterMemberRole.valueOf( roleName.toUpperCase() );
+        ClusterMemberRole role = extractRole( record );
         return role != ClusterMemberRole.READ_REPLICA;
     }
 
@@ -277,6 +277,11 @@ private static ClusterMember findByBoltUri( URI boltUri, Set<ClusterMember> memb
         return null;
     }
 
+    private static Driver createDriver( URI boltUri, String password )
+    {
+        return GraphDatabase.driver( boltUri, AuthTokens.basic( ADMIN_USER, password ), driverConfig() );
+    }
+
     private static Config driverConfig()
     {
         // try to build config for a very lightweight driver

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterControl.java

@@ -35,7 +35,7 @@ private ClusterControl()
     {
     }
 
-    static boolean boltKitAvailable()
+    static boolean boltKitClusterAvailable()
     {
         try
         {

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterMember.java

@@ -25,6 +25,9 @@
 
 public class ClusterMember
 {
+    private static final String SIMPLE_SCHEME = "bolt://";
+    private static final String ROUTING_SCHEME = "bolt+routing://";
+
     private final URI boltUri;
     private final Path path;
 
@@ -41,7 +44,7 @@ public URI getBoltUri()
 
     public URI getRoutingUri()
     {
-        return URI.create( boltUri.toString().replace( "bolt://", "bolt+routing://" ) );
+        return URI.create( boltUri.toString().replace( SIMPLE_SCHEME, ROUTING_SCHEME ) );
     }
 
     public Path getPath()

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterRule.java

@@ -31,7 +31,6 @@
 import org.neo4j.driver.v1.AuthToken;
 import org.neo4j.driver.v1.AuthTokens;
 
-import static java.lang.System.err;
 import static org.junit.Assume.assumeTrue;
 
 public class ClusterRule extends ExternalResource
@@ -40,6 +39,12 @@ public class ClusterRule extends ExternalResource
     private static final String PASSWORD = "test";
     private static final int INITIAL_PORT = 20_000;
 
+    // todo: neo4j version should come from environment variables
+    private static final String NEO4J_VERSION = "3.1.0-RC1";
+    // todo: should be possible to configure (dynamically add/remove) cores and read replicas
+    private static final int CORE_COUNT = 3;
+    private static final int READ_REPLICA_COUNT = 2;
+
     public Cluster getCluster()
     {
         return SharedCluster.get();
@@ -53,17 +58,34 @@ public AuthToken getDefaultAuthToken()
     @Override
     protected void before() throws Throwable
     {
-        assumeTrue( "BoltKit unavailable", ClusterControl.boltKitAvailable() );
+        assumeTrue( "BoltKit cluster support unavailable", ClusterControl.boltKitClusterAvailable() );
 
         if ( !SharedCluster.exists() )
         {
+            deleteClusterDir();
+
+            SharedCluster.install( NEO4J_VERSION, CORE_COUNT, READ_REPLICA_COUNT, PASSWORD, INITIAL_PORT, CLUSTER_DIR );
+
             try
             {
-                delete( CLUSTER_DIR );
-                // todo: get version from env
-                SharedCluster.install( "3.1.0-M13-beta3", 3, 2, PASSWORD, INITIAL_PORT, CLUSTER_DIR );
                 SharedCluster.start();
             }
+            catch ( Throwable startError )
+            {
+                try
+                {
+                    SharedCluster.kill();
+                }
+                catch ( Throwable killError )
+                {
+                    startError.addSuppressed( killError );
+                }
+                finally
+                {
+                    SharedCluster.remove();
+                }
+                throw startError;
+            }
             finally
             {
                 addShutdownHookToStopCluster();
@@ -74,7 +96,7 @@ protected void before() throws Throwable
     @Override
     protected void after()
     {
-        getCluster().cleanUp();
+        getCluster().deleteData();
     }
 
     private static void addShutdownHookToStopCluster()
@@ -87,17 +109,21 @@ public void run()
                 try
                 {
                     SharedCluster.kill();
-                    delete( CLUSTER_DIR );
                 }
                 catch ( Throwable t )
                 {
-                    err.println( "Cluster stopping shutdown hook failed" );
+                    System.err.println( "Cluster stopping shutdown hook failed" );
                     t.printStackTrace();
                 }
             }
         } );
     }
 
+    private static void deleteClusterDir()
+    {
+        delete( CLUSTER_DIR );
+    }
+
     private static void delete( final Path path )
     {
         try

driver/src/test/java/org/neo4j/driver/v1/util/cc/SharedCluster.java

@@ -40,6 +40,12 @@ static Cluster get()
         return clusterInstance;
     }
 
+    static void remove()
+    {
+        assertClusterExists();
+        clusterInstance = null;
+    }
+
     static boolean exists()
     {
         return clusterInstance != null;