Skip to content

fix RareClusterStateIT #87922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2022
Merged

fix RareClusterStateIT #87922

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84835fd
fix RareClusterStateIT
idegtiarenko Jun 22, 2022
388d3a6
fix comments
idegtiarenko Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 39 additions & 8 deletions ...c/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
Expand All @@ -28,6 +29,7 @@
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.cluster.routing.allocation.AllocationService;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.index.Index;
Expand Down Expand Up @@ -132,15 +134,43 @@ private <Req extends ActionRequest, Res extends ActionResponse> ActionFuture<Res
// Wait for no publication in progress to not accidentally cancel a publication different from the one triggered by the given
// request.
final Coordinator masterCoordinator = internalCluster().getCurrentMasterNodeInstance(Coordinator.class);
assertBusy(() -> {
assertFalse(masterCoordinator.publicationInProgress());
final long applierVersion = masterCoordinator.getApplierState().version();
for (Coordinator instance : internalCluster().getInstances(Coordinator.class)) {
assertEquals(instance.getApplierState().version(), applierVersion);
}
});

ensureNoPendingMasterTasks().actionGet(TimeValue.timeValueSeconds(30));
ActionFuture<Res> future = req.execute();

// cancel the first cluster state update produced by the request above
assertBusy(() -> assertTrue(masterCoordinator.cancelCommittedPublication()));
// await and cancel any other forked cluster state updates that might be produced by the request
var task = ensureNoPendingMasterTasks();
while (task.isDone() == false) {
masterCoordinator.cancelCommittedPublication();
Thread.onSpinWait();
}
task.actionGet(TimeValue.timeValueSeconds(30));

return future;
}

private PlainActionFuture<Void> ensureNoPendingMasterTasks() {
var future = new PlainActionFuture<Void>();
internalCluster().getCurrentMasterNodeInstance(ClusterService.class)
.submitUnbatchedStateUpdateTask("test", new ClusterStateUpdateTask(Priority.LANGUID, TimeValue.timeValueSeconds(30)) {

@Override
public ClusterState execute(ClusterState currentState) {
return currentState;
}

@Override
public void clusterStateProcessed(ClusterState oldState, ClusterState newState) {
future.onResponse(null);
}

@Override
public void onFailure(Exception e) {
future.onFailure(e);
}
});
return future;
}

Expand All @@ -158,8 +188,9 @@ public void testDeleteCreateInOneBulk() throws Exception {
indexDoc("test", "1");
refresh();
disruption.startDisrupting();
logger.info("--> delete index and recreate it");
logger.info("--> delete index");
executeAndCancelCommittedPublication(client().admin().indices().prepareDelete("test").setTimeout("0s")).get(10, TimeUnit.SECONDS);
logger.info("--> and recreate it");
executeAndCancelCommittedPublication(
prepareCreate("test").setSettings(
Settings.builder()
Expand Down