More logging on edge server startup + retry on failure

neo4j · Sep 6, 2016 · 09c55d8 · 09c55d8
1 parent e67240b
commit 09c55d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EdgeStartupProcess.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EdgeStartupProcess.java
@@ -72,12 +72,14 @@ public void start() throws Throwable
         MemberId memberId = findCoreMemberToCopyFrom();
         if ( localDatabase.isEmpty() )
         {
-            log.info( "Local database is empty. Stopping local database" );
+            log.info( "Local database is empty, attempting to replace with copy from core server %s", memberId );
+            log.info( "Stopping local database before copy." );
             localDatabase.stop();
-            log.info( "Getting StoreId from %s", memberId );
+            log.info( "Finding store id of core server %s", memberId );
             StoreId storeId = storeFetcher.storeId( memberId );
-            log.info( "Got StoreId %s from %s", storeId, memberId );
+            log.info( "Copying store from core server %s", memberId );
             localDatabase.bringUpToDateOrReplaceStoreFrom( memberId, storeId, storeFetcher );
+            log.info( "Restarting local database after copy.", memberId );
             localDatabase.start();
         }
         else
@@ -97,7 +99,7 @@ private MemberId findCoreMemberToCopyFrom()
             try
             {
                 MemberId memberId = connectionStrategy.coreMember();
-                log.info( "Server starting, connecting to core server at %s", memberId.toString() );
+                log.info( "Server starting, connecting to core server %s", memberId );
                 return memberId;
             }
             catch ( CoreMemberSelectionException ex )

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
@@ -98,25 +98,22 @@ public void start() throws InterruptedException, ExecutionException
         ExecutorService executor = Executors.newCachedThreadPool( new NamedThreadFactory( "cluster-starter" ) );
         try
         {
+            CompletionService<EdgeGraphDatabase> edgeGraphDatabaseCompletionService = startEdgeMembers( executor );
             startCoreMembers( executor );
-            startEdgeMembers( executor );
+            waitForEdgeServers( edgeGraphDatabaseCompletionService );
         }
         finally
         {
             executor.shutdown();
         }
     }
 
-    public void startCoreMembers() throws InterruptedException, ExecutionException
+    private void waitForEdgeServers( CompletionService<EdgeGraphDatabase> edgeGraphDatabaseCompletionService ) throws
+            InterruptedException, ExecutionException
     {
-        ExecutorService executor = Executors.newCachedThreadPool( new NamedThreadFactory( "cluster-starter" ) );
+        for ( int i = 0; i < edgeMembers.size(); i++ )
-        try
         {
-            startCoreMembers( executor );
+            edgeGraphDatabaseCompletionService.take().get();
-        }
-        finally
-        {
-            executor.shutdown();
         }
     }
 
@@ -428,7 +425,7 @@ private void startCoreMembers( ExecutorService executor ) throws InterruptedExce
         }
     }
 
-    private void startEdgeMembers( ExecutorService executor ) throws InterruptedException, ExecutionException
+    private CompletionService<EdgeGraphDatabase> startEdgeMembers( ExecutorService executor ) throws InterruptedException, ExecutionException
     {
         CompletionService<EdgeGraphDatabase> ecs = new ExecutorCompletionService<>( executor );
 
@@ -440,11 +437,7 @@ private void startEdgeMembers( ExecutorService executor ) throws InterruptedExce
                 return edgeClusterMember.database();
             } );
         }
-
+        return ecs;
-        for ( int i = 0; i < edgeMembers.size(); i++ )
-        {
-            ecs.take().get();
-        }
     }
 
     private void createEdgeMembers( int noOfEdgeMembers,