Address search request timeouts as transient error #561
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
jowg-amazon
requested review from
amsiglan,
AWSHurneyt,
getsaurabh02,
lezzago,
praveensameneni,
sbcd90 and
eirsep
as code owners
Codecov Report
@@ Coverage Diff @@
## main #561 +/- ##
=========================================
Coverage 25.02% 25.02%
Complexity 943 943
=========================================
Files 255 255
Lines 11155 11155
Branches 1250 1250
=========================================
Hits 2791 2791
Misses 8110 8110
Partials 254 254
|
src/main/java/org/opensearch/securityanalytics/logtype/LogTypeService.java
Outdated
Show resolved
Hide resolved
| @@ -336,7 +336,7 @@ public void onResponse(IndexResponse response) { | |||
| @Override | |||
| public void onResponse(SearchResponse response) { | |||
| if (response.isTimedOut()) { | |||
| onFailures(new OpenSearchStatusException(response.toString(), RestStatus.INTERNAL_SERVER_ERROR)); | |||
| onFailures(new OpenSearchStatusException(response.toString(), RestStatus.REQUEST_TIMEOUT)); | |||
There was a problem hiding this comment.
Should we rely on response.toString() or should we have a more customized error message which can help debug better?
(this comment applies to other code changes as well where we are generating similar timeout errors using response.toString())
There was a problem hiding this comment.
updated so all errors are consistent with a "Search request timed out" message
Signed-off-by: jowg-amazon <[email protected]>
Signed-off-by: jowg-amazon <[email protected]>
jowg-amazon
force-pushed
the
request_timeout
branch
from
8977bbd to
389cc2b
Compare
sandeshkr419
reviewed
Oct 4, 2023
| @@ -65,10 +65,10 @@ public void onResponse(BulkByScrollResponse response) { | |||
| new OpenSearchStatusException( | |||
| String.format( | |||
| Locale.getDefault(), | |||
| "Correlation Rule with id %s cannot be deleted", | |||
| "Search request timed out. Correlation Rule with id %s cannot be deleted", | |||
There was a problem hiding this comment.
Is this a search request?
There was a problem hiding this comment.
Changed to "request timed out"
Signed-off-by: jowg-amazon <[email protected]>
lezzago
approved these changes
Oct 4, 2023
eirsep
reviewed
Oct 4, 2023
| @@ -152,7 +152,7 @@ private void onGetResponse(Rule rule) { | |||
| @Override | |||
| public void onResponse(SearchResponse response) { | |||
| if (response.isTimedOut()) { | |||
There was a problem hiding this comment.
this should be a generic utils method which is invoked mutliple times. else the error message and format wont be consistent
There was a problem hiding this comment.
a utils method called handleSearchResponseTimeOut() maybe?
eirsep
approved these changes
Oct 4, 2023
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Oct 5, 2023
Signed-off-by: jowg-amazon <[email protected]> (cherry picked from commit 3aa2844)
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Oct 5, 2023
Signed-off-by: jowg-amazon <[email protected]> (cherry picked from commit 3aa2844)
lezzago
pushed a commit
that referenced
this pull request
Oct 5, 2023
Signed-off-by: jowg-amazon <[email protected]> (cherry picked from commit 3aa2844) Co-authored-by: Joanne Wang <[email protected]>
lezzago
pushed a commit
that referenced
this pull request
Oct 5, 2023
Signed-off-by: jowg-amazon <[email protected]> (cherry picked from commit 3aa2844) Co-authored-by: Joanne Wang <[email protected]>
riysaxen-amzn
pushed a commit
to riysaxen-amzn/security-analytics
that referenced
this pull request
Feb 20, 2024
* passing props for date time filter (opensearch-project#551) Signed-off-by: Amardeepsingh Siglani <[email protected]> * added loading state Signed-off-by: Amardeepsingh Siglani <[email protected]> * ux improvements Signed-off-by: Amardeepsingh Siglani <[email protected]> * transform vega-lite files for jest testing Signed-off-by: Amardeepsingh Siglani <[email protected]> --------- Signed-off-by: Amardeepsingh Siglani <[email protected]>
|
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-2.9 2.9
# Navigate to the new working tree
cd .worktrees/backport-2.9
# Create a new branch
git switch --create backport/backport-561-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3aa28448a05aee7001323065ad06606acdb7383d
# Push it to GitHub
git push --set-upstream origin backport/backport-561-to-2.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.9Then, create a pull request where the |
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
Change rest status on search request timeouts to be a transient error:
REQUEST_TIMEOUTIssues Resolved
#502
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.