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

Add execution_duration to watch history records. 

This change add the actual length of time a watch spends executing. This is useful to find watches that take long to execute to pinpoint those watches that may be candidates for throttling.
Add the execution_duration as a number of milliseconds rather than a timevalue so it can be aggregated from the watch_history index.

Original commit: elastic/x-pack-elasticsearch@0036468f55
This commit is contained in:
Brian Murphy 2015-05-12 10:33:55 -04:00
parent 2f48d980b3
commit 46c111b016
6 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/elasticsearch/watcher/execution/ExecutionService.java
View File

@ -272,6 +272,7 @@ public class ExecutionService extends AbstractComponent {
}
WatchExecutionResult executeInner(WatchExecutionContext ctx) throws IOException {
ctx.start();
Watch watch = ctx.watch();
ctx.beforeInput();
Input.Result inputResult = ctx.inputResult();

10
src/main/java/org/elasticsearch/watcher/execution/WatchExecutionContext.java
View File

@ -42,6 +42,8 @@ public abstract class WatchExecutionContext {
private volatile ExecutionPhase executionPhase = ExecutionPhase.AWAITS_EXECUTION;
private long actualExecutionStartMs;
public WatchExecutionContext(Watch watch, DateTime executionTime, TriggerEvent triggerEvent, TimeValue defaultThrottlePeriod) {
this.id = new Wid(watch.id(), watch.nonce(), executionTime);
this.watch = watch;
@ -171,12 +173,18 @@ public abstract class WatchExecutionContext {
return new ExecutableActions.Results(actionsResults);
}
public void start() {
actualExecutionStartMs = System.currentTimeMillis();
}
public WatchExecutionResult finish() {
executionPhase = ExecutionPhase.FINISHED;
return new WatchExecutionResult(this);
long executionFinishMs = System.currentTimeMillis();
return new WatchExecutionResult(this, executionFinishMs - actualExecutionStartMs);
}
public WatchExecutionSnapshot createSnapshot(Thread executionThread) {
return new WatchExecutionSnapshot(this, executionThread.getStackTrace());
}
}

24
src/main/java/org/elasticsearch/watcher/execution/WatchExecutionResult.java
View File

@ -32,27 +32,33 @@ import static org.elasticsearch.common.joda.time.DateTimeZone.UTC;
public class WatchExecutionResult implements ToXContent {
private final DateTime executionTime;
private final long executionDurationMs;
private final Input.Result inputResult;
private final Condition.Result conditionResult;
private final @Nullable Transform.Result transformResult;
private final ExecutableActions.Results actionsResults;
public WatchExecutionResult(WatchExecutionContext context) {
this(context.executionTime(), context.inputResult(), context.conditionResult(), context.transformResult(), context.actionsResults());
public WatchExecutionResult(WatchExecutionContext context, long executionDurationMs) {
this(context.executionTime(), executionDurationMs, context.inputResult(), context.conditionResult(), context.transformResult(), context.actionsResults());
}
WatchExecutionResult(DateTime executionTime, Input.Result inputResult, Condition.Result conditionResult, @Nullable Transform.Result transformResult, ExecutableActions.Results actionsResults) {
WatchExecutionResult(DateTime executionTime, long executionDurationMs, Input.Result inputResult, Condition.Result conditionResult, @Nullable Transform.Result transformResult, ExecutableActions.Results actionsResults) {
this.executionTime = executionTime;
this.inputResult = inputResult;
this.conditionResult = conditionResult;
this.transformResult = transformResult;
this.actionsResults = actionsResults;
this.executionDurationMs = executionDurationMs;
}
public DateTime executionTime() {
return executionTime;
}
public long executionDurationMs() {
return executionDurationMs;
}
public Input.Result inputResult() {
return inputResult;
}
@ -72,7 +78,10 @@ public class WatchExecutionResult implements ToXContent {
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject();
WatcherDateTimeUtils.writeDate(Field.EXECUTION_TIME.getPreferredName(), builder, executionTime);
builder.field(Field.EXECUTION_DURATION.getPreferredName(), executionDurationMs);
if (inputResult != null) {
builder.startObject(Field.INPUT.getPreferredName())
.field(inputResult.type(), inputResult, params)
@ -97,6 +106,9 @@ public class WatchExecutionResult implements ToXContent {
public static WatchExecutionResult parse(Wid wid, XContentParser parser, ConditionRegistry conditionRegistry, ActionRegistry actionRegistry,
InputRegistry inputRegistry, TransformRegistry transformRegistry) throws IOException {
DateTime executionTime = null;
long executionDurationMs = 0;
boolean throttled = false;
String throttleReason = null;
ExecutableActions.Results actionResults = null;
Input.Result inputResult = null;
Condition.Result conditionResult = null;
@ -121,6 +133,8 @@ public class WatchExecutionResult implements ToXContent {
conditionResult = conditionRegistry.parseResult(wid.watchId(), parser);
} else if (Transform.Field.TRANSFORM.match(currentFieldName)) {
transformResult = transformRegistry.parseResult(wid.watchId(), parser);
} else if (Field.EXECUTION_DURATION.match(currentFieldName) && token.isValue()) {
executionDurationMs = parser.longValue();
} else {
throw new WatcherException("could not parse watch execution [{}]. unexpected field [{}]", wid, currentFieldName);
}
@ -128,7 +142,8 @@ public class WatchExecutionResult implements ToXContent {
if (executionTime == null) {
throw new WatcherException("could not parse watch execution [{}]. missing required date field [{}]", wid, Field.EXECUTION_TIME.getPreferredName());
}
return new WatchExecutionResult(executionTime, inputResult, conditionResult, transformResult, actionResults);
return new WatchExecutionResult(executionTime, executionDurationMs, inputResult, conditionResult, transformResult, actionResults);
}
}
@ -137,5 +152,6 @@ public class WatchExecutionResult implements ToXContent {
ParseField INPUT = new ParseField("input");
ParseField CONDITION = new ParseField("condition");
ParseField ACTIONS = new ParseField("actions");
ParseField EXECUTION_DURATION = new ParseField("execution_duration");
}
}

3
src/main/resources/watch_history.json
View File

@ -78,6 +78,9 @@
"execution_time": {
"type": "date"
},
"execution_duration": {
"type": "long"
},
"input": {
"type": "object",
"dynamic": true,

13
src/test/java/org/elasticsearch/watcher/execution/ManualExecutionTests.java
View File

@ -239,6 +239,19 @@ public class ManualExecutionTests extends AbstractWatcherIntegrationTests {
assertThat(watchRecord.state(), equalTo(WatchRecord.State.THROTTLED));
}
@Test
public void testWatchExecutionDuration() throws Exception {
WatchSourceBuilder watchBuilder = watchBuilder()
.trigger(schedule(cron("0 0 0 1 * ? 2099")))
.input(simpleInput("foo", "bar"))
.condition(new ScriptCondition((new Script.Builder.Inline("sleep 100; return true")).build()))
.addAction("log", loggingAction("foobar"));
Watch watch = watchParser().parse("_id", false, watchBuilder.buildAsBytes(XContentType.JSON));
ManualExecutionContext.Builder ctxBuilder = ManualExecutionContext.builder(watch, new ManualTriggerEvent("_id", new ScheduleTriggerEvent(new DateTime(UTC), new DateTime(UTC))), new TimeValue(1, TimeUnit.HOURS));
WatchRecord record = executionService().execute(ctxBuilder.build());
assertThat(record.execution().executionDurationMs(), greaterThanOrEqualTo(100L));
}
@Test
@Slow

12
src/test/java/org/elasticsearch/watcher/history/WatchRecordTests.java
View File

@ -17,6 +17,7 @@ import org.elasticsearch.watcher.condition.Condition;
import org.elasticsearch.watcher.condition.always.AlwaysCondition;
import org.elasticsearch.watcher.execution.TriggeredExecutionContext;
import org.elasticsearch.watcher.execution.WatchExecutionContext;
import org.elasticsearch.watcher.execution.WatchExecutionResult;
import org.elasticsearch.watcher.execution.Wid;
import org.elasticsearch.watcher.input.simple.SimpleInput;
import org.elasticsearch.watcher.support.http.HttpRequest;
@ -26,7 +27,6 @@ import org.elasticsearch.watcher.test.WatcherTestUtils;
import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent;
import org.elasticsearch.watcher.watch.Payload;
import org.elasticsearch.watcher.watch.Watch;
import org.elasticsearch.watcher.execution.WatchExecutionResult;
import org.junit.Test;
import static org.elasticsearch.common.joda.time.DateTimeZone.UTC;
@ -70,8 +70,9 @@ public class WatchRecordTests extends AbstractWatcherIntegrationTests {
Condition.Result conditionResult = AlwaysCondition.Result.INSTANCE;
ctx.onInputResult(inputResult);
ctx.onConditionResult(conditionResult);
watchRecord.seal(new WatchExecutionResult(ctx));
long watchExecutionDuration = randomIntBetween(30, 100000);
watchRecord.seal(new WatchExecutionResult(ctx, watchExecutionDuration));
assertThat(watchRecord.execution().executionDurationMs(), equalTo(watchExecutionDuration));
XContentBuilder jsonBuilder = XContentFactory.jsonBuilder();
watchRecord.toXContent(jsonBuilder, ToXContent.EMPTY_PARAMS);
WatchRecord parsedWatchRecord = watchRecordParser().parse(watchRecord.id().value(), 0, jsonBuilder.bytes());
@ -98,8 +99,9 @@ public class WatchRecordTests extends AbstractWatcherIntegrationTests {
Condition.Result conditionResult = AlwaysCondition.Result.INSTANCE;
ctx.onInputResult(inputResult);
ctx.onConditionResult(conditionResult);
watchRecord.seal(new WatchExecutionResult(ctx));
long watchExecutionDuration = randomIntBetween(30, 100000);
watchRecord.seal(new WatchExecutionResult(ctx, watchExecutionDuration));
assertThat(watchRecord.execution().executionDurationMs(), equalTo(watchExecutionDuration));
XContentBuilder jsonBuilder = XContentFactory.jsonBuilder();
watchRecord.toXContent(jsonBuilder, ToXContent.EMPTY_PARAMS);
WatchRecord parsedWatchRecord = watchRecordParser().parse(watchRecord.id().value(), 0, jsonBuilder.bytes());