Skip to content

Add forcibly argument to test cluster stop node method #98336

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 1 commit into from
Aug 9, 2023
Merged

Add forcibly argument to test cluster stop node method #98336

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion test/test-clusters/src/main/java/org/elasticsearch/test/cluster/ClusterHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public interface ClusterHandle extends Closeable {
* Stops the node at a given index.
* @param index of the node to stop
*/
void stopNode(int index);
void stopNode(int index, boolean forcibly);

/**
* Restarts the cluster. Effectively the same as calling {@link #stop(boolean)} followed by {@link #start()}
Expand Down
4 changes: 2 additions & 2 deletions ...st-clusters/src/main/java/org/elasticsearch/test/cluster/DefaultElasticsearchCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public void stop(boolean forcibly) {
}

@Override
public void stopNode(int index) {
public void stopNode(int index, boolean forcibly) {
checkHandle();
handle.stopNode(index);
handle.stopNode(index, forcibly);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions .../test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void start() {
public void stop(boolean forcibly) {
if (started.getAndSet(false)) {
LOGGER.info("Stopping Elasticsearch test cluster '{}', forcibly: {}", name, forcibly);
execute(() -> nodes.parallelStream().forEach(n -> n.stop(forcibly)));
execute(() -> nodes.parallelStream().forEach(n -> stopNode(nodes.indexOf(n), forcibly)));
} else {
// Make sure the process is stopped, otherwise wait
execute(() -> nodes.parallelStream().forEach(Node::waitForExit));
Expand Down Expand Up @@ -167,7 +167,7 @@ public long getPid(int index) {
return nodes.get(index).getPid();
}

public void stopNode(int index) {
public void stopNode(int index, boolean forcibly) {
nodes.get(index).stop(false);
}

Expand Down