Skip to content

Commit 1b3920b

Browse files
committed
Fix Flaky Test SpecificClusterManagerNodesIT.testElectOnlyBetweenClusterManagerNodes
Signed-off-by: kkewwei <kkewwei@163.com>
1 parent 9537d39 commit 1b3920b

File tree

1 file changed

+22
-32
lines changed

1 file changed

+22
-32
lines changed

server/src/internalClusterTest/java/org/opensearch/cluster/SpecificClusterManagerNodesIT.java

+22-32
Original file line numberDiff line numberDiff line change
@@ -224,19 +224,6 @@ public void testElectOnlyBetweenClusterManagerNodes() throws Exception {
224224
.getName(),
225225
equalTo(clusterManagerNodeName)
226226
);
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-
);
240227
assertThat(
241228
internalCluster().clusterManagerClient()
242229
.admin()
@@ -254,8 +241,10 @@ public void testElectOnlyBetweenClusterManagerNodes() throws Exception {
254241
logger.info("--> closing cluster-manager node (1)");
255242
client().execute(AddVotingConfigExclusionsAction.INSTANCE, new AddVotingConfigExclusionsRequest(clusterManagerNodeName)).get();
256243
// 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(
259248
internalCluster().nonClusterManagerClient()
260249
.admin()
261250
.cluster()
@@ -265,23 +254,24 @@ public void testElectOnlyBetweenClusterManagerNodes() throws Exception {
265254
.getState()
266255
.nodes()
267256
.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+
285275
internalCluster().stopRandomNode(InternalTestCluster.nameFilter(clusterManagerNodeName));
286276
assertThat(
287277
internalCluster().nonClusterManagerClient()

0 commit comments

Comments
 (0)