Skip to content

Make testDatafeedTimingStats_DatafeedJobIdUpdated test easier to debug #44206

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 2 commits into from
Jul 12, 2019
Merged

Make testDatafeedTimingStats_DatafeedJobIdUpdated test easier to debug #44206

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf3f471
* Change test jobs/datafeeds names used by DatafeedTimingStats-relate…
przemekwitek Jul 11, 2019
d59543c
Apply review comments
przemekwitek Jul 11, 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
32 changes: 21 additions & 11 deletions ...multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import org.elasticsearch.action.admin.cluster.node.hotthreads.NodeHotThreads;
import org.elasticsearch.action.admin.cluster.node.hotthreads.NodesHotThreadsResponse;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.CheckedConsumer;
import org.elasticsearch.common.CheckedRunnable;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.common.util.concurrent.ConcurrentMapLong;
Expand Down Expand Up @@ -106,15 +108,15 @@ public void testDatafeedTimingStats_DatafeedRecreated() throws Exception {
Instant now = Instant.now();
indexDocs(logger, "data", numDocs, now.minus(Duration.ofDays(14)).toEpochMilli(), now.toEpochMilli());

Job.Builder job = createScheduledJob("lookback-job");
Job.Builder job = createScheduledJob("lookback-job-datafeed-recreated");

String datafeedId = "lookback-datafeed";
String datafeedId = "lookback-datafeed-datafeed-recreated";
DatafeedConfig datafeedConfig = createDatafeed(datafeedId, job.getId(), Arrays.asList("data"));

registerJob(job);
putJob(job);

for (int i = 0; i < 2; ++i) {
CheckedRunnable<Exception> openAndRunJob = () -> {
openJob(job.getId());
assertBusy(() -> assertEquals(getJobStats(job.getId()).get(0).getState(), JobState.OPENED));
registerDatafeed(datafeedConfig);
Expand All @@ -129,7 +131,10 @@ public void testDatafeedTimingStats_DatafeedRecreated() throws Exception {
}, 60, TimeUnit.SECONDS);
deleteDatafeed(datafeedId);
waitUntilJobIsClosed(job.getId());
}
};

openAndRunJob.run();
openAndRunJob.run();
}

public void testDatafeedTimingStats_DatafeedJobIdUpdated() throws Exception {
Expand All @@ -140,8 +145,8 @@ public void testDatafeedTimingStats_DatafeedJobIdUpdated() throws Exception {
Instant now = Instant.now();
indexDocs(logger, "data", numDocs, now.minus(Duration.ofDays(14)).toEpochMilli(), now.toEpochMilli());

Job.Builder jobA = createScheduledJob("lookback-job");
Job.Builder jobB = createScheduledJob("other-lookback-job");
Job.Builder jobA = createScheduledJob("lookback-job-jobid-updated");
Job.Builder jobB = createScheduledJob("other-lookback-job-jobid-updated");
for (Job.Builder job : Arrays.asList(jobA, jobB)) {
registerJob(job);
putJob(job);
Expand All @@ -152,11 +157,10 @@ public void testDatafeedTimingStats_DatafeedJobIdUpdated() throws Exception {
registerDatafeed(datafeedConfig);
putDatafeed(datafeedConfig);

for (Job.Builder job : Arrays.asList(jobA, jobB, jobA)) {
CheckedConsumer<Job.Builder, Exception> openAndRunJob = job -> {
openJob(job.getId());
assertBusy(() -> assertEquals(getJobStats(job.getId()).get(0).getState(), JobState.OPENED));
// Bind datafeedId to the current job on the list, timing stats are wiped out.
updateDatafeed(new DatafeedUpdate.Builder(datafeedId).setJobId(job.getId()).build());
// Datafeed did not do anything yet, hence search_count is equal to 0.
assertDatafeedStats(datafeedId, DatafeedState.STOPPED, job.getId(), equalTo(0L));
startDatafeed(datafeedId, 0L, now.toEpochMilli());
Expand All @@ -166,7 +170,13 @@ public void testDatafeedTimingStats_DatafeedJobIdUpdated() throws Exception {
assertDatafeedStats(datafeedId, DatafeedState.STOPPED, job.getId(), greaterThan(0L));
}, 60, TimeUnit.SECONDS);
waitUntilJobIsClosed(job.getId());
}
};

openAndRunJob.accept(jobA);
updateDatafeed(new DatafeedUpdate.Builder(datafeedId).setJobId(jobB.getId()).build()); // wipes out timing stats
openAndRunJob.accept(jobB);
updateDatafeed(new DatafeedUpdate.Builder(datafeedId).setJobId(jobA.getId()).build()); // wipes out timing stats
openAndRunJob.accept(jobA);
}

public void testDatafeedTimingStats_QueryDelayUpdated_TimingStatsNotReset() throws Exception {
Expand All @@ -177,11 +187,11 @@ public void testDatafeedTimingStats_QueryDelayUpdated_TimingStatsNotReset() thro
Instant now = Instant.now();
indexDocs(logger, "data", numDocs, now.minus(Duration.ofDays(14)).toEpochMilli(), now.toEpochMilli());

Job.Builder job = createScheduledJob("lookback-job");
Job.Builder job = createScheduledJob("lookback-job-query-delay-updated");
registerJob(job);
putJob(job);

String datafeedId = "lookback-datafeed";
String datafeedId = "lookback-datafeed-query-delay-updated";
DatafeedConfig datafeedConfig = createDatafeed(datafeedId, job.getId(), Arrays.asList("data"));
registerDatafeed(datafeedConfig);
putDatafeed(datafeedConfig);
Expand Down