From 572826b400a8366b4b50c33662f84716862e50e1 Mon Sep 17 00:00:00 2001 From: Mark Needham Date: Tue, 6 Sep 2016 15:59:14 +0100 Subject: [PATCH] start core servers first while we sort out shutting down CatchupServer when a core server is copying the store down --- .../java/org/neo4j/coreedge/discovery/Cluster.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 index 9db4196417908..3185c7ddf0e9d 100644 --- 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,9 +98,8 @@ public void start() throws InterruptedException, ExecutionException ExecutorService executor = Executors.newCachedThreadPool( new NamedThreadFactory( "cluster-starter" ) ); try { - CompletionService edgeGraphDatabaseCompletionService = startEdgeMembers( executor ); startCoreMembers( executor ); - waitForEdgeServers( edgeGraphDatabaseCompletionService ); + startEdgeMembers( executor ); } finally { @@ -425,7 +424,7 @@ private void startCoreMembers( ExecutorService executor ) throws InterruptedExce } } - private CompletionService startEdgeMembers( ExecutorService executor ) throws InterruptedException, ExecutionException + private void startEdgeMembers( ExecutorService executor ) throws InterruptedException, ExecutionException { CompletionService ecs = new ExecutorCompletionService<>( executor ); @@ -437,7 +436,11 @@ private CompletionService startEdgeMembers( ExecutorService e return edgeClusterMember.database(); } ); } - return ecs; + + for ( int i = 0; i < edgeMembers.size(); i++ ) + { + ecs.take().get(); + } } private void createEdgeMembers( int noOfEdgeMembers,