-
Notifications
You must be signed in to change notification settings - Fork 326
Fix OpenSearch source pagination to handle failures correctly #6829
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
Open
Keyur-S-Patel
wants to merge
2
commits into
opensearch-project:main
Choose a base branch
from
Keyur-S-Patel:fix/6337-opensearch-source-failure-handling
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
This file contains hidden or 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
87 changes: 87 additions & 0 deletions
87
...ain/java/org/opensearch/dataprepper/plugins/source/opensearch/ShardFailureAggregator.java
This file contains hidden or 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,87 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.dataprepper.plugins.source.opensearch; | ||
|
|
||
| import org.opensearch.dataprepper.plugins.source.opensearch.worker.client.model.SearchShardStatistics; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.Map; | ||
|
|
||
| class ShardFailureAggregator { | ||
|
|
||
| static final int MAX_DISTINCT_REASONS = 20; | ||
| static final String OVERFLOW_REASON_KEY = "__other__"; | ||
|
|
||
| private boolean hadFailures; | ||
| private final Map<String, Long> failureReasonCounts; | ||
|
|
||
| ShardFailureAggregator() { | ||
| this.hadFailures = false; | ||
| this.failureReasonCounts = new LinkedHashMap<>(); | ||
| } | ||
|
|
||
| ShardFailureAggregator(final boolean hadFailures, final Map<String, Long> counts) { | ||
| this.hadFailures = hadFailures; | ||
| this.failureReasonCounts = counts == null ? new LinkedHashMap<>() : new LinkedHashMap<>(counts); | ||
| } | ||
|
|
||
| void recordShardFailures(final SearchShardStatistics pageStats) { | ||
| if (pageStats == null || !pageStats.hasFailures()) { | ||
| return; | ||
| } | ||
| this.hadFailures = true; | ||
| mergeFailureReasonCounts(pageStats.getFailureReasonCounts()); | ||
| } | ||
|
|
||
| void recordRequestFailure(final Throwable throwable) { | ||
| this.hadFailures = true; | ||
| final String key; | ||
| if (throwable == null) { | ||
| key = "unknown"; | ||
| } else { | ||
| final String message = throwable.getMessage() == null ? "" : ": " + throwable.getMessage(); | ||
| key = SearchShardStatistics.normalizeReason(throwable.getClass().getSimpleName() + message); | ||
| } | ||
| increment(key, 1L); | ||
| } | ||
|
|
||
| boolean hadFailures() { | ||
| return hadFailures; | ||
| } | ||
|
|
||
| Map<String, Long> getFailureReasonCounts() { | ||
| return Collections.unmodifiableMap(failureReasonCounts); | ||
| } | ||
|
|
||
| private void mergeFailureReasonCounts(final Map<String, Long> toMerge) { | ||
| if (toMerge == null || toMerge.isEmpty()) { | ||
| return; | ||
| } | ||
| for (final Map.Entry<String, Long> entry : toMerge.entrySet()) { | ||
| increment(entry.getKey(), entry.getValue() == null ? 0L : entry.getValue()); | ||
| } | ||
| } | ||
|
|
||
| private void increment(final String key, final long delta) { | ||
| if (key == null || delta <= 0) { | ||
| return; | ||
| } | ||
| if (failureReasonCounts.containsKey(key)) { | ||
| failureReasonCounts.merge(key, delta, Long::sum); | ||
| return; | ||
| } | ||
| if (failureReasonCounts.size() < MAX_DISTINCT_REASONS) { | ||
| failureReasonCounts.put(key, delta); | ||
| return; | ||
| } | ||
| failureReasonCounts.merge(OVERFLOW_REASON_KEY, delta, Long::sum); | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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.
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.
I see that we have a
@JsonPropertyon the constructor, but not on the getters or fields. How does this work now?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.
will add on the field