|
|
@@ -146,7 +146,8 @@ public class RareClusterStateIT extends ESIntegTestCase {
|
|
|
private <Req extends ActionRequest, Res extends ActionResponse> ActionFuture<Res> executeAndCancelCommittedPublication(
|
|
|
ActionRequestBuilder<Req, Res> req) throws Exception {
|
|
|
ActionFuture<Res> future = req.execute();
|
|
|
- assertBusy(() -> assertTrue(((Coordinator)internalCluster().getMasterNodeInstance(Discovery.class)).cancelCommittedPublication()));
|
|
|
+ assertBusy(
|
|
|
+ () -> assertTrue(((Coordinator)internalCluster().getCurrentMasterNodeInstance(Discovery.class)).cancelCommittedPublication()));
|
|
|
return future;
|
|
|
}
|
|
|
|
|
|
@@ -276,7 +277,6 @@ public class RareClusterStateIT extends ESIntegTestCase {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/36813")
|
|
|
public void testDelayedMappingPropagationOnReplica() throws Exception {
|
|
|
// This is essentially the same thing as testDelayedMappingPropagationOnPrimary
|
|
|
// but for replicas
|