Merge pull request #7849 from martinfurmanski/3.1-bs-tmo

core-edge: longer timeout for binding to cluster
neo4j · Sep 2, 2016 · bc76366 · bc76366
2 parents 94422f2 + cfbfcc3
commit bc76366
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/BindingService.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/BindingService.java
@@ -96,7 +96,7 @@ private ClusterId bindToCluster() throws IOException, InterruptedException, Time
             }
             else
             {
-                throw new TimeoutException( "Failed binding to cluster in time." );
+                throw new TimeoutException( "Failed binding to cluster in time. Last topology was: " + topology );
             }
         }
 

diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/ClusteringModule.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/ClusteringModule.java
@@ -59,7 +59,7 @@ public ClusteringModule( DiscoveryServiceFactory discoveryServiceFactory, Member
         topologyService = discoveryServiceFactory.coreTopologyService( config, myself, discoveredMemberRepository,
                 logProvider );
         BindingService bindingService = new BindingService( clusterIdStorage, topologyService, logProvider,
-                Clocks.systemClock(), () -> sleep( 100 ), 60000 );
+                Clocks.systemClock(), () -> sleep( 100 ), 300_000 );
 
         life.add( topologyService );
         life.add( bindingService );