Skip to content
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

Watcher: Ensure trigger service pauses execution #30363

Merged
merged 4 commits into from
May 4, 2018
Merged

Watcher: Ensure trigger service pauses execution #30363

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2523c73
Watcher: Ensure trigger service pauses execution
spinscale May 3, 2018
07f346b
Merge branch 'master' into 1804-ensure-triggerservice-pauses-execution
spinscale May 3, 2018
e338444
review comment: movve triggerservice first
spinscale May 3, 2018
5d01323
Merge branch 'master' into 1804-ensure-triggerservice-pauses-execution
spinscale May 3, 2018
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: 2 additions & 0 deletions x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ void shutDown() {
void stopExecutor() {
ThreadPool.terminate(executor, 10L, TimeUnit.SECONDS);
}

/**
* Reload the watcher service, does not switch the state from stopped to started, just keep going
* @param state cluster state, which is needed to find out about local shards
Expand Down Expand Up @@ -232,6 +233,7 @@ private synchronized void reloadInner(ClusterState state, String reason, boolean
*/
public void pauseExecution(String reason) {
int cancelledTaskCount = executionService.pause();
triggerService.pauseExecution();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it maybe make sense to pause the trigger service before pausing the execution service?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indeed. changed

logger.info("paused watch execution, reason [{}], cancelled [{}] queued tasks", reason, cancelledTaskCount);
}

Expand Down
34 changes: 34 additions & 0 deletions x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,14 @@
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.xpack.core.XPackSettings;
import org.elasticsearch.xpack.core.watcher.trigger.Trigger;
import org.elasticsearch.xpack.core.watcher.watch.Watch;
import org.elasticsearch.xpack.core.watcher.watch.WatchStatus;
import org.elasticsearch.xpack.watcher.condition.InternalAlwaysCondition;
import org.elasticsearch.xpack.watcher.execution.ExecutionService;
import org.elasticsearch.xpack.watcher.execution.TriggeredWatchStore;
import org.elasticsearch.xpack.watcher.input.none.ExecutableNoneInput;
import org.elasticsearch.xpack.watcher.trigger.TriggerEngine;
import org.elasticsearch.xpack.watcher.trigger.TriggerService;
import org.elasticsearch.xpack.watcher.watch.WatchParser;
import org.joda.time.DateTime;
Expand Down Expand Up @@ -204,6 +208,36 @@ void stopExecutor() {
assertThat(watches, hasSize(activeWatchCount));
}

public void testPausingWatcherServiceAlsoPausesTriggerService() {
String engineType = "foo";
TriggerEngine triggerEngine = mock(TriggerEngine.class);
when(triggerEngine.type()).thenReturn(engineType);
TriggerService triggerService = new TriggerService(Settings.EMPTY, Collections.singleton(triggerEngine));

Trigger trigger = mock(Trigger.class);
when(trigger.type()).thenReturn(engineType);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only a nit: It does not influence the test in any way but at first I was confused that you return engineType as result of the trigger.type() call. Copy & paste error?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is intentional, as otherwise the TriggerService.addToStats()/TriggerService.add() methods both would NPE, and also the reason why there is a "foo" mock engine added... hope that explains it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, thanks for the explanation.


Watch watch = mock(Watch.class);
when(watch.trigger()).thenReturn(trigger);
when(watch.condition()).thenReturn(InternalAlwaysCondition.INSTANCE);
ExecutableNoneInput noneInput = new ExecutableNoneInput(logger);
when(watch.input()).thenReturn(noneInput);

triggerService.add(watch);
assertThat(triggerService.count(), is(1L));

WatcherService service = new WatcherService(Settings.EMPTY, triggerService, mock(TriggeredWatchStore.class),
mock(ExecutionService.class), mock(WatchParser.class), mock(Client.class), executorService) {
@Override
void stopExecutor() {
}
};

service.pauseExecution("pausing");
assertThat(triggerService.count(), is(0L));
verify(triggerEngine).pauseExecution();
}

private static DiscoveryNode newNode() {
return new DiscoveryNode("node", ESTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(),
new HashSet<>(asList(DiscoveryNode.Role.values())), Version.CURRENT);
Expand Down