honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Watcher: use same value of watcher state (elastic/x-pack-elasticsearch#4430) 

This commit updates the WatcherLifecycleService to use the same value
for the watcher service state when making comparisons to determine the
actions that need to be taken.

See elastic/x-pack-elasticsearch#4429

Original commit: elastic/x-pack-elasticsearch@c6c24fc6da
This commit is contained in:
Jay Modi 2018-04-20 08:05:58 -06:00 committed by GitHub
parent 03ecbc0ccb
commit cdf41cffd8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java
View File

@ -87,7 +87,7 @@ public class WatcherLifeCycleService extends AbstractComponent implements Cluste
if (shutDown) {
return;
}
WatcherState watcherState = watcherService.state();
final WatcherState watcherState = watcherService.state();
if (watcherState != WatcherState.STOPPED) {
logger.debug("not starting watcher. watcher can only start if its current state is [{}], but its current state now is [{}]",
WatcherState.STOPPED, watcherState);
@ -162,9 +162,10 @@ public class WatcherLifeCycleService extends AbstractComponent implements Cluste
clearAllocationIds();
executor.execute(() -> this.stop("watcher manually marked to shutdown by cluster state update"));
} else {
if (watcherService.state() == WatcherState.STARTED && event.state().nodes().getLocalNode().isDataNode()) {
final WatcherState watcherState = watcherService.state();
if (watcherState == WatcherState.STARTED && event.state().nodes().getLocalNode().isDataNode()) {
checkAndSetAllocationIds(event.state(), true);
} else if (watcherService.state() != WatcherState.STARTED && watcherService.state() != WatcherState.STARTING) {
} else if (watcherState != WatcherState.STARTED && watcherState != WatcherState.STARTING) {
IndexMetaData watcherIndexMetaData = WatchStoreUtils.getConcreteIndex(Watch.INDEX, event.state().metaData());
IndexMetaData triggeredWatchesIndexMetaData = WatchStoreUtils.getConcreteIndex(TriggeredWatchStoreField.INDEX_NAME,
event.state().metaData());