Skip to content

Improve watcher cleanup logic #67554

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
Jan 15, 2021
Merged

Improve watcher cleanup logic #67554

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
5 changes: 5 additions & 0 deletions ...terTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ public void _cleanup() throws Exception {
// Clear all internal watcher state for the next test method:
logger.info("[#{}]: clearing watcher state", getTestName());
stopWatcher();
// Wait for all pending tasks to complete, this to avoid any potential incoming writes
// to watcher history data stream to recreate the data stream after it has been created.
// Otherwise ESIntegTestCase test cluster's wipe cluster logic that deletes all indices may fail,
// because it attempts to remove the write index of an existing data stream.
waitNoPendingTasksOnAll();
String[] dataStreamsToDelete = {HistoryStoreField.DATA_STREAM};
client().execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(dataStreamsToDelete));
GetDataStreamAction.Request getDataStreamRequest = new GetDataStreamAction.Request(dataStreamsToDelete);
Expand Down