@@ -224,19 +224,6 @@ public void testElectOnlyBetweenClusterManagerNodes() throws Exception {
224
224
.getName (),
225
225
equalTo (clusterManagerNodeName )
226
226
);
227
- assertThat (
228
- internalCluster ().nonClusterManagerClient ()
229
- .admin ()
230
- .cluster ()
231
- .prepareState ()
232
- .execute ()
233
- .actionGet ()
234
- .getState ()
235
- .nodes ()
236
- .getClusterManagerNode ()
237
- .getName (),
238
- equalTo (clusterManagerNodeName )
239
- );
240
227
assertThat (
241
228
internalCluster ().clusterManagerClient ()
242
229
.admin ()
@@ -254,8 +241,10 @@ public void testElectOnlyBetweenClusterManagerNodes() throws Exception {
254
241
logger .info ("--> closing cluster-manager node (1)" );
255
242
client ().execute (AddVotingConfigExclusionsAction .INSTANCE , new AddVotingConfigExclusionsRequest (clusterManagerNodeName )).get ();
256
243
// removing the cluster-manager from the voting configuration immediately triggers the cluster-manager to step down
257
- assertBusy (() -> {
258
- assertThat (
244
+
245
+ // make sure `nextClusterManagerEligableNodeName` has been elected as the new cluster-manager
246
+ waitUntil (
247
+ () -> nextClusterManagerEligableNodeName .equals (
259
248
internalCluster ().nonClusterManagerClient ()
260
249
.admin ()
261
250
.cluster ()
@@ -265,23 +254,24 @@ public void testElectOnlyBetweenClusterManagerNodes() throws Exception {
265
254
.getState ()
266
255
.nodes ()
267
256
.getClusterManagerNode ()
268
- .getName (),
269
- equalTo (nextClusterManagerEligableNodeName )
270
- );
271
- assertThat (
272
- internalCluster ().clusterManagerClient ()
273
- .admin ()
274
- .cluster ()
275
- .prepareState ()
276
- .execute ()
277
- .actionGet ()
278
- .getState ()
279
- .nodes ()
280
- .getClusterManagerNode ()
281
- .getName (),
282
- equalTo (nextClusterManagerEligableNodeName )
283
- );
284
- });
257
+ .getName ()
258
+ )
259
+ );
260
+
261
+ assertThat (
262
+ internalCluster ().clusterManagerClient ()
263
+ .admin ()
264
+ .cluster ()
265
+ .prepareState ()
266
+ .execute ()
267
+ .actionGet ()
268
+ .getState ()
269
+ .nodes ()
270
+ .getClusterManagerNode ()
271
+ .getName (),
272
+ equalTo (nextClusterManagerEligableNodeName )
273
+ );
274
+
285
275
internalCluster ().stopRandomNode (InternalTestCluster .nameFilter (clusterManagerNodeName ));
286
276
assertThat (
287
277
internalCluster ().nonClusterManagerClient ()
0 commit comments