Check if indices exist in the presence of empty search results #495
Conversation
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
Previously, CompositeRetriever throws an IllegalArgumentException in the presence of empty results, which gets translated to internal failure and increments AD failure count. When the source index is a regex like blah*, we will get an empty response even if the index does not exist. This PR checks indices exist in the presence of empty search results. If yes, we throw an IndexNotFoundException that ends up being converted to EndRunException; if no, we still throw an IllegalArgumentException. Testing done: 1. added unit tests 2. reproduced manually and verified the change fixed the issue. Signed-off-by: Kaituo Li <[email protected]>
ylwu-amzn
reviewed
Apr 8, 2022
| * 2) next detection interval has not started | ||
| * @return true if the iteration has more pages. | ||
| */ | ||
| public boolean hasNext() { | ||
| return (totalResults == 0 || (totalResults > 0 && afterKey != null)) && expirationEpochMs > clock.millis(); | ||
| return (iterations == 0 || (totalResults > 0 && afterKey != null)) && expirationEpochMs > clock.millis(); |
There was a problem hiding this comment.
Is it possible iterations == 0 and afterKey == null? Not sure if this is enough afterKey != null && expirationEpochMs > clock.millis()
There was a problem hiding this comment.
Is it possible iterations == 0 and afterKey == null
It is possible.
afterKey != null && expirationEpochMs > clock.millis()
This is not enough as at the beginning afterKey = null.
amitgalitz
reviewed
Apr 8, 2022
src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java
Outdated
Show resolved
Hide resolved
amitgalitz
reviewed
Apr 8, 2022
Signed-off-by: Kaituo Li <[email protected]>
amitgalitz
previously approved these changes
Apr 8, 2022
Signed-off-by: Kaituo Li <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #495 +/- ##
============================================
+ Coverage 78.14% 78.20% +0.06%
- Complexity 4155 4162 +7
============================================
Files 296 296
Lines 17654 17663 +9
Branches 1877 1878 +1
============================================
+ Hits 13795 13814 +19
+ Misses 2963 2954 -9
+ Partials 896 895 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
|
amitgalitz
approved these changes
Apr 9, 2022
ylwu-amzn
approved these changes
Apr 9, 2022
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-495-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9d44f1bad1bd674c8a03b2629ababab21783f2f3
# Push it to GitHub
git push --set-upstream origin backport/backport-495-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.xThen, create a pull request where the |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-495-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9d44f1bad1bd674c8a03b2629ababab21783f2f3
# Push it to GitHub
git push --set-upstream origin backport/backport-495-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3Then, create a pull request where the |
kaituo
added a commit
to kaituo/anomaly-detection-1
that referenced
this pull request
Apr 25, 2022
…rch results (opensearch-project#495) * Check if indices exist in the presence of empty search results Previously, CompositeRetriever throws an IllegalArgumentException in the presence of empty results, which gets translated to internal failure and increments AD failure count. When the source index is a regex like blah*, we will get an empty response even if the index does not exist. This PR checks indices exist in the presence of empty search results. If yes, we throw an IndexNotFoundException that ends up being converted to EndRunException; if no, we still throw an IllegalArgumentException. Testing done: 1. added unit tests 2. reproduced manually and verified the change fixed the issue. Signed-off-by: Kaituo Li <[email protected]>
kaituo
added a commit
that referenced
this pull request
Apr 25, 2022
…rch results (#495) (#522) * Check if indices exist in the presence of empty search results Previously, CompositeRetriever throws an IllegalArgumentException in the presence of empty results, which gets translated to internal failure and increments AD failure count. When the source index is a regex like blah*, we will get an empty response even if the index does not exist. This PR checks indices exist in the presence of empty search results. If yes, we throw an IndexNotFoundException that ends up being converted to EndRunException; if no, we still throw an IllegalArgumentException. Testing done: 1. added unit tests 2. reproduced manually and verified the change fixed the issue. Signed-off-by: Kaituo Li <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Previously, CompositeRetriever throws an IllegalArgumentException in the presence of empty results, which gets translated to internal failure and increments AD failure count. When the source index is a regex like blah*, we will get an empty response even if the index does not exist. This PR checks indices exist in the presence of empty search results. If yes, we throw an IndexNotFoundException that ends up being converted to EndRunException; if no, we still throw an IllegalArgumentException.
Testing done:
Signed-off-by: Kaituo Li [email protected]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.