Skip to content

Ensure no Watches are running after Watcher is stopped. #43888

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

Closed
wants to merge 7 commits into from
Closed

Ensure no Watches are running after Watcher is stopped. #43888

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
926a671
Ensure no Watches are running after Watcher is stopped.
jakelandis Jul 2, 2019
9d18274
fix check style
jakelandis Jul 2, 2019
33d06f9
Merge branch 'master' into watcher_stop_less_async
elasticmachine Jul 2, 2019
ce5dd1b
Revert "fix check style"
jakelandis Jul 2, 2019
ec360da
Revert "Ensure no Watches are running after Watcher is stopped."
jakelandis Jul 2, 2019
caa9ae9
Ensure no Watches are running after Watcher is stopped.
jakelandis Jul 2, 2019
f3c5462
Merge branch 'watcher_stop_less_async' of github.com:jakelandis/elast…
jakelandis Jul 2, 2019
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
3 changes: 1 addition & 2 deletions ...gin/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,7 @@ public Counters executionTimes() {
*/
private void clearExecutions() {
final CurrentExecutions currentExecutionsBeforeSetting = currentExecutions.getAndSet(new CurrentExecutions());
// clear old executions in background, no need to wait
genericExecutor.execute(() -> currentExecutionsBeforeSetting.sealAndAwaitEmpty(maxStopTimeout));
currentExecutionsBeforeSetting.sealAndAwaitEmpty(maxStopTimeout);
}

// the watch execution task takes another runnable as parameter
Expand Down