-
Notifications
You must be signed in to change notification settings - Fork 24.9k
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.
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
[ML] Add graceful retry for anomaly detector result indexing failures #49508
Merged
benwtrent
merged 20 commits into
elastic:master
from
benwtrent:feature/ml-persist-results-retry
Dec 12, 2019
Merged
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
19c67d6
[ML] Add graceful retry for bulk index results failures
benwtrent 1877d4e
fixing test, removing unused import
benwtrent 6d59172
moving retries to individual actions in `processResult` so result pro…
benwtrent ed4d9a1
clear out bulk request if not able to persist after retrying
benwtrent ff2b984
Merge branch 'master' into feature/ml-persist-results-retry
elasticmachine 1bf708e
removing successful bulk response items from subsequent bulk requests
benwtrent 02c220c
Merge branch 'master' into feature/ml-persist-results-retry
benwtrent 791c570
adding retries for all synchronous persistent calls
benwtrent bf749d7
Fixing refresh policy handling bug and missing settings
benwtrent 0e01259
fixing datafeed timing stats persistence
benwtrent 4710635
rewriting datacounts reporter to use retries
benwtrent 7e4642f
cleanup and addressing pr comments
benwtrent cb8a5b2
using builder where possible
benwtrent 7814ed2
adjusing backoff calculation
benwtrent fbd717a
Merge branch 'master' into feature/ml-persist-results-retry
elasticmachine 724dfcf
disallow int wrapping
benwtrent cb03f38
Merge branch 'feature/ml-persist-results-retry' of github.com:benwtre…
benwtrent 756be6c
Adding auditor messaging indicating failures and retries
benwtrent 6e1a25a
addressing PR comments
benwtrent a9fba44
Merge branch 'master' into feature/ml-persist-results-retry
elasticmachine File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
214 changes: 214 additions & 0 deletions
214
...i-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/BulkFailureRetryIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,214 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.ml.integration; | ||
|
||
import org.apache.logging.log4j.Logger; | ||
import org.elasticsearch.action.ActionListener; | ||
import org.elasticsearch.action.bulk.BulkItemResponse; | ||
import org.elasticsearch.action.bulk.BulkRequestBuilder; | ||
import org.elasticsearch.action.bulk.BulkResponse; | ||
import org.elasticsearch.action.index.IndexRequest; | ||
import org.elasticsearch.action.support.WriteRequest; | ||
import org.elasticsearch.action.support.master.AcknowledgedResponse; | ||
import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
import org.elasticsearch.common.settings.Settings; | ||
import org.elasticsearch.common.unit.TimeValue; | ||
import org.elasticsearch.xpack.core.action.util.PageParams; | ||
import org.elasticsearch.xpack.core.ml.action.GetBucketsAction; | ||
import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig; | ||
import org.elasticsearch.xpack.core.ml.job.config.AnalysisConfig; | ||
import org.elasticsearch.xpack.core.ml.job.config.DataDescription; | ||
import org.elasticsearch.xpack.core.ml.job.config.Detector; | ||
import org.elasticsearch.xpack.core.ml.job.config.Job; | ||
import org.elasticsearch.xpack.core.ml.job.results.Bucket; | ||
import org.elasticsearch.xpack.core.ml.job.results.Result; | ||
import org.junit.After; | ||
import org.junit.Before; | ||
|
||
import java.time.Duration; | ||
import java.util.Collections; | ||
import java.util.concurrent.CountDownLatch; | ||
import java.util.concurrent.atomic.AtomicReference; | ||
import java.util.function.Consumer; | ||
|
||
import static org.elasticsearch.xpack.ml.support.BaseMlIntegTestCase.createDatafeedBuilder; | ||
import static org.hamcrest.Matchers.greaterThan; | ||
|
||
public class BulkFailureRetryIT extends MlNativeAutodetectIntegTestCase { | ||
|
||
private final String index = "bulk-failure-retry"; | ||
private long now = System.currentTimeMillis(); | ||
private static long DAY = Duration.ofDays(1).toMillis(); | ||
private final String jobId = "bulk-failure-retry-job"; | ||
private final String resultsIndex = ".ml-anomalies-custom-bulk-failure-retry-job"; | ||
|
||
@Before | ||
public void putPastDataIntoIndex() { | ||
client().admin().indices().prepareCreate(index) | ||
.addMapping("type", "time", "type=date", "value", "type=long") | ||
.get(); | ||
long twoDaysAgo = now - DAY * 2; | ||
long threeDaysAgo = now - DAY * 3; | ||
writeData(logger, index, 250, threeDaysAgo, twoDaysAgo); | ||
} | ||
|
||
@After | ||
public void cleanUpTest() { | ||
client().admin() | ||
.cluster() | ||
.prepareUpdateSettings() | ||
.setTransientSettings(Settings.builder() | ||
.putNull("xpack.ml.persist_results_max_retries") | ||
.putNull("logger.org.elasticsearch.xpack.ml.datafeed.DatafeedJob") | ||
.putNull("logger.org.elasticsearch.xpack.ml.job.persistence.JobResultsPersister") | ||
.putNull("logger.org.elasticsearch.xpack.ml.job.process.autodetect.output") | ||
.build()).get(); | ||
cleanUp(); | ||
} | ||
|
||
private void ensureAnomaliesWrite() throws InterruptedException { | ||
Settings settings = Settings.builder().put(IndexMetaData.INDEX_READ_ONLY_SETTING.getKey(), false).build(); | ||
AtomicReference<AcknowledgedResponse> acknowledgedResponseHolder = new AtomicReference<>(); | ||
AtomicReference<Exception> exceptionHolder = new AtomicReference<>(); | ||
blockingCall( | ||
listener -> client().admin().indices().prepareUpdateSettings(resultsIndex).setSettings(settings).execute(listener), | ||
acknowledgedResponseHolder, | ||
exceptionHolder); | ||
if (exceptionHolder.get() != null) { | ||
fail("FAILED TO MARK ["+ resultsIndex + "] as read-write again" + exceptionHolder.get()); | ||
} | ||
} | ||
|
||
private void setAnomaliesReadOnlyBlock() throws InterruptedException { | ||
Settings settings = Settings.builder().put(IndexMetaData.INDEX_READ_ONLY_SETTING.getKey(), true).build(); | ||
AtomicReference<AcknowledgedResponse> acknowledgedResponseHolder = new AtomicReference<>(); | ||
AtomicReference<Exception> exceptionHolder = new AtomicReference<>(); | ||
blockingCall( | ||
listener -> client().admin().indices().prepareUpdateSettings(resultsIndex).setSettings(settings).execute(listener), | ||
acknowledgedResponseHolder, | ||
exceptionHolder); | ||
if (exceptionHolder.get() != null) { | ||
fail("FAILED TO MARK ["+ resultsIndex + "] as read-ONLY: " + exceptionHolder.get()); | ||
} | ||
} | ||
|
||
public void testBulkFailureRetries() throws Exception { | ||
Job.Builder job = createJob(jobId, TimeValue.timeValueMinutes(5), "count", null); | ||
job.setResultsIndexName(jobId); | ||
|
||
DatafeedConfig.Builder datafeedConfigBuilder = | ||
createDatafeedBuilder(job.getId() + "-datafeed", job.getId(), Collections.singletonList(index)); | ||
DatafeedConfig datafeedConfig = datafeedConfigBuilder.build(); | ||
registerJob(job); | ||
putJob(job); | ||
openJob(job.getId()); | ||
registerDatafeed(datafeedConfig); | ||
putDatafeed(datafeedConfig); | ||
long twoDaysAgo = now - 2 * DAY; | ||
startDatafeed(datafeedConfig.getId(), 0L, twoDaysAgo); | ||
waitUntilJobIsClosed(jobId); | ||
|
||
// Get the job stats | ||
Bucket initialLatestBucket = getLatestFinalizedBucket(jobId); | ||
assertThat(initialLatestBucket.getEpoch(), greaterThan(0L)); | ||
|
||
client().admin() | ||
.cluster() | ||
.prepareUpdateSettings() | ||
.setTransientSettings(Settings.builder() | ||
.put("logger.org.elasticsearch.xpack.ml.datafeed.DatafeedJob", "TRACE") | ||
.put("logger.org.elasticsearch.xpack.ml.job.persistence.JobResultsPersister", "TRACE") | ||
.put("logger.org.elasticsearch.xpack.ml.job.process.autodetect.output", "TRACE") | ||
.put("xpack.ml.persist_results_max_retries", "15") | ||
.build()).get(); | ||
|
||
setAnomaliesReadOnlyBlock(); | ||
|
||
int moreDocs = 1_000; | ||
writeData(logger, index, moreDocs, twoDaysAgo, now); | ||
|
||
openJob(job.getId()); | ||
startDatafeed(datafeedConfig.getId(), twoDaysAgo, now); | ||
|
||
ensureAnomaliesWrite(); | ||
waitUntilJobIsClosed(jobId); | ||
|
||
Bucket newLatestBucket = getLatestFinalizedBucket(jobId); | ||
assertThat(newLatestBucket.getEpoch(), greaterThan(initialLatestBucket.getEpoch())); | ||
} | ||
|
||
private Job.Builder createJob(String id, TimeValue bucketSpan, String function, String field) { | ||
return createJob(id, bucketSpan, function, field, null); | ||
} | ||
|
||
private Job.Builder createJob(String id, TimeValue bucketSpan, String function, String field, String summaryCountField) { | ||
DataDescription.Builder dataDescription = new DataDescription.Builder(); | ||
przemekwitek marked this conversation as resolved.
Show resolved
Hide resolved
|
||
dataDescription.setFormat(DataDescription.DataFormat.XCONTENT); | ||
dataDescription.setTimeField("time"); | ||
dataDescription.setTimeFormat(DataDescription.EPOCH_MS); | ||
|
||
Detector.Builder d = new Detector.Builder(function, field); | ||
AnalysisConfig.Builder analysisConfig = new AnalysisConfig.Builder(Collections.singletonList(d.build())) | ||
.setBucketSpan(bucketSpan) | ||
.setSummaryCountFieldName(summaryCountField); | ||
|
||
return new Job.Builder().setId(id).setAnalysisConfig(analysisConfig).setDataDescription(dataDescription); | ||
} | ||
|
||
private void writeData(Logger logger, String index, long numDocs, long start, long end) { | ||
int maxDelta = (int) (end - start - 1); | ||
BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); | ||
for (int i = 0; i < numDocs; i++) { | ||
IndexRequest indexRequest = new IndexRequest(index); | ||
long timestamp = start + randomIntBetween(0, maxDelta); | ||
assert timestamp >= start && timestamp < end; | ||
indexRequest.source("time", timestamp, "value", i); | ||
bulkRequestBuilder.add(indexRequest); | ||
} | ||
BulkResponse bulkResponse = bulkRequestBuilder | ||
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) | ||
.get(); | ||
if (bulkResponse.hasFailures()) { | ||
int failures = 0; | ||
for (BulkItemResponse itemResponse : bulkResponse) { | ||
if (itemResponse.isFailed()) { | ||
failures++; | ||
logger.error("Item response failure [{}]", itemResponse.getFailureMessage()); | ||
} | ||
} | ||
fail("Bulk response contained " + failures + " failures"); | ||
} | ||
logger.info("Indexed [{}] documents", numDocs); | ||
} | ||
|
||
private Bucket getLatestFinalizedBucket(String jobId) { | ||
GetBucketsAction.Request getBucketsRequest = new GetBucketsAction.Request(jobId); | ||
getBucketsRequest.setExcludeInterim(true); | ||
getBucketsRequest.setSort(Result.TIMESTAMP.getPreferredName()); | ||
getBucketsRequest.setDescending(true); | ||
getBucketsRequest.setPageParams(new PageParams(0, 1)); | ||
return getBuckets(getBucketsRequest).get(0); | ||
} | ||
|
||
private <T> void blockingCall(Consumer<ActionListener<T>> function, | ||
AtomicReference<T> response, | ||
AtomicReference<Exception> error) throws InterruptedException { | ||
CountDownLatch latch = new CountDownLatch(1); | ||
ActionListener<T> listener = ActionListener.wrap( | ||
r -> { | ||
response.set(r); | ||
latch.countDown(); | ||
}, | ||
e -> { | ||
error.set(e); | ||
latch.countDown(); | ||
} | ||
); | ||
|
||
function.accept(listener); | ||
latch.await(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it have a potential of affecting other, unrelated tests?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see the
@After
clause. It sets all back tonull
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see this part. My question was more along the lines if it is possible that 2 test classes will share these cluster settings. But I guess it's not the case.