@@ -267,7 +267,7 @@ public void verifyReposThenStopServices() {
267
267
final AtomicBoolean cleanedUp = new AtomicBoolean (false );
268
268
continueOrDie (cleanupResponse , r -> cleanedUp .set (true ));
269
269
270
- runUntil (cleanedUp ::get , TimeUnit .MINUTES .toMillis (5L ));
270
+ runUntil (cleanedUp ::get , TimeUnit .MINUTES .toMillis (1L ));
271
271
272
272
if (blobStoreContext != null ) {
273
273
blobStoreContext .forceConsistent ();
@@ -1193,6 +1193,8 @@ private final class TestClusterNode {
1193
1193
1194
1194
private final ClusterService clusterService ;
1195
1195
1196
+ private final NodeConnectionsService nodeConnectionsService ;
1197
+
1196
1198
private final RepositoriesService repositoriesService ;
1197
1199
1198
1200
private final SnapshotsService snapshotsService ;
@@ -1344,6 +1346,8 @@ public void onFailure(final Exception e) {
1344
1346
new BatchedRerouteService (clusterService , allocationService ::reroute ),
1345
1347
threadPool
1346
1348
);
1349
+ nodeConnectionsService =
1350
+ new NodeConnectionsService (clusterService .getSettings (), threadPool , transportService );
1347
1351
@ SuppressWarnings ("rawtypes" )
1348
1352
Map <ActionType , TransportAction > actions = new HashMap <>();
1349
1353
actions .put (GlobalCheckpointSyncAction .TYPE ,
@@ -1521,10 +1525,9 @@ public void start(ClusterState initialState) {
1521
1525
new BatchedRerouteService (clusterService , allocationService ::reroute ), ElectionStrategy .DEFAULT_INSTANCE );
1522
1526
masterService .setClusterStatePublisher (coordinator );
1523
1527
coordinator .start ();
1524
- masterService .start ();
1525
- clusterService .getClusterApplierService ().setNodeConnectionsService (
1526
- new NodeConnectionsService (clusterService .getSettings (), threadPool , transportService ));
1527
- clusterService .getClusterApplierService ().start ();
1528
+ clusterService .getClusterApplierService ().setNodeConnectionsService (nodeConnectionsService );
1529
+ nodeConnectionsService .start ();
1530
+ clusterService .start ();
1528
1531
indicesService .start ();
1529
1532
indicesClusterStateService .start ();
1530
1533
coordinator .startInitialJoin ();
0 commit comments