Skip to content

Fix PersistentTasksClusterServiceTests #92002

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
DaveCTurner merged 1 commit into from
Nov 29, 2022
Merged

Fix PersistentTasksClusterServiceTests #92002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -527,7 +528,7 @@ public void testPeriodicRecheckOffMaster() {
assertFalse(service.getPeriodicRechecker().isScheduled());
}

public void testUnassignTask() {
public void testUnassignTask() throws InterruptedException {
ClusterState clusterState = initialState();
ClusterState.Builder builder = ClusterState.builder(clusterState);
PersistentTasksCustomMetadata.Builder tasks = PersistentTasksCustomMetadata.builder(
Expand All @@ -545,14 +546,18 @@ public void testUnassignTask() {
clusterState = builder.metadata(metadata).nodes(nodes).build();
setState(clusterService, clusterState);
PersistentTasksClusterService service = createService((params, candidateNodes, currentState) -> new Assignment("_node_2", "test"));
final var countDownLatch = new CountDownLatch(1);
service.unassignPersistentTask(unassignedId, tasks.getLastAllocationId(), "unassignment test", ActionListener.wrap(task -> {
assertThat(task.getAssignment().getExecutorNode(), is(nullValue()));
assertThat(task.getId(), equalTo(unassignedId));
assertThat(task.getAssignment().getExplanation(), equalTo("unassignment test"));
countDownLatch.countDown();
}, e -> fail()));

assertTrue(countDownLatch.await(10, TimeUnit.SECONDS));
}

public void testUnassignNonExistentTask() {
public void testUnassignNonExistentTask() throws InterruptedException {
ClusterState clusterState = initialState();
ClusterState.Builder builder = ClusterState.builder(clusterState);
PersistentTasksCustomMetadata.Builder tasks = PersistentTasksCustomMetadata.builder(
Expand All @@ -568,12 +573,18 @@ public void testUnassignNonExistentTask() {
clusterState = builder.metadata(metadata).nodes(nodes).build();
setState(clusterService, clusterState);
PersistentTasksClusterService service = createService((params, candidateNodes, currentState) -> new Assignment("_node_2", "test"));
final var countDownLatch = new CountDownLatch(1);
service.unassignPersistentTask(
"missing-task",
tasks.getLastAllocationId(),
"unassignment test",
ActionListener.wrap(task -> fail(), e -> assertThat(e, instanceOf(ResourceNotFoundException.class)))
ActionListener.wrap(task -> fail(), e -> {
assertThat(e, instanceOf(ResourceNotFoundException.class));
countDownLatch.countDown();
})
);

assertTrue(countDownLatch.await(10, TimeUnit.SECONDS));
}

public void testTasksNotAssignedToShuttingDownNodes() {
Expand Down