fix more places where thread context not restored #1421
Merged
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
Signed-off-by: Yaliang Wu <[email protected]>
ylwu-amzn
had a problem deploying
to
ml-commons-cicd-env
GitHub Actions
Error
ylwu-amzn
had a problem deploying
to
ml-commons-cicd-env
GitHub Actions
Error
ylwu-amzn
had a problem deploying
to
ml-commons-cicd-env
GitHub Actions
Failure
ylwu-amzn
had a problem deploying
to
ml-commons-cicd-env
GitHub Actions
Failure
Signed-off-by: Yaliang Wu <[email protected]>
ylwu-amzn
temporarily deployed
to
ml-commons-cicd-env
GitHub Actions
Inactive
ylwu-amzn
temporarily deployed
to
ml-commons-cicd-env
GitHub Actions
Inactive
ylwu-amzn
temporarily deployed
to
ml-commons-cicd-env
GitHub Actions
Inactive
ylwu-amzn
temporarily deployed
to
ml-commons-cicd-env
GitHub Actions
Inactive
saratvemulapalli
approved these changes
Oct 3, 2023
| modelAccessControlHelper.validateModelGroupAccess(user, mlModel.getModelGroupId(), client, listener); | ||
| }, e -> { | ||
| log.error("Failed to find Model", e); | ||
| listener.onFailure(e); | ||
| })); | ||
| }), () -> context.restore())); |
There was a problem hiding this comment.
Isn't the context restored anyway after this statement?
There was a problem hiding this comment.
yes, but the action listener is running inside it
| @@ -80,6 +80,7 @@ public void search(SearchRequest request, ActionListener<SearchResponse> actionL | |||
| User user = RestActionUtils.getUserContext(client); | |||
| ActionListener<SearchResponse> listener = wrapRestActionListener(actionListener, "Fail to search model version"); | |||
| try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) { | |||
| ActionListener<SearchResponse> wrappedListener = ActionListener.runBefore(listener, () -> context.restore()); | |||
There was a problem hiding this comment.
I assume we can't provide this listener as generic from utils because context doesn't exist?
dhrubo-os
previously approved these changes
Oct 3, 2023
ylwu-amzn
commented
Oct 3, 2023
| @@ -9,6 +9,8 @@ | |||
| import static org.opensearch.ml.common.CommonValue.ML_MODEL_INDEX; | |||
| import static org.opensearch.ml.utils.RestActionUtils.PARAMETER_MODEL_GROUP_ID; | |||
|
|
|||
| import javax.swing.*; | |||
There was a problem hiding this comment.
Self review and find this , should remove this line
Signed-off-by: Yaliang Wu <[email protected]>
ylwu-amzn
temporarily deployed
to
ml-commons-cicd-env
GitHub Actions
Inactive
ylwu-amzn
temporarily deployed
to
ml-commons-cicd-env
GitHub Actions
Inactive
ylwu-amzn
temporarily deployed
to
ml-commons-cicd-env
GitHub Actions
Inactive
ylwu-amzn
temporarily deployed
to
ml-commons-cicd-env
GitHub Actions
Inactive
dhrubo-os
approved these changes
Oct 3, 2023
rbhavna
approved these changes
Oct 3, 2023
Codecov Report
@@ Coverage Diff @@
## 2.9 #1421 +/- ##
============================================
- Coverage 78.81% 78.73% -0.09%
- Complexity 2156 2160 +4
============================================
Files 168 168
Lines 8767 8775 +8
Branches 878 878
============================================
- Hits 6910 6909 -1
- Misses 1456 1465 +9
Partials 401 401
Flags with carried forward coverage won't be shown. Click here to find out more.
|
ylwu-amzn
added a commit
to ylwu-amzn/ml-commons
that referenced
this pull request
Oct 3, 2023
…#1421) * fix more places where thread context not restored Signed-off-by: Yaliang Wu <[email protected]> * fix failed ut Signed-off-by: Yaliang Wu <[email protected]> * remove unused import Signed-off-by: Yaliang Wu <[email protected]> --------- Signed-off-by: Yaliang Wu <[email protected]>
ylwu-amzn
added a commit
that referenced
this pull request
Oct 3, 2023
* fix more places where thread context not restored * fix failed ut * remove unused import --------- Signed-off-by: Yaliang Wu <[email protected]>
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Oct 4, 2023
* fix more places where thread context not restored * fix failed ut * remove unused import --------- Signed-off-by: Yaliang Wu <[email protected]> (cherry picked from commit d8c1162)
dhrubo-os
pushed a commit
that referenced
this pull request
Oct 5, 2023
) * fix more places where thread context not restored * fix failed ut * remove unused import --------- Signed-off-by: Yaliang Wu <[email protected]> (cherry picked from commit d8c1162) Co-authored-by: Yaliang Wu <[email protected]>
TrungBui59
pushed a commit
to TrungBui59/ml-commons
that referenced
this pull request
Nov 21, 2023
…#1421) (opensearch-project#1423) (opensearch-project#1436) * fix more places where thread context not restored * fix failed ut * remove unused import --------- Signed-off-by: Yaliang Wu <[email protected]> (cherry picked from commit d8c1162) Co-authored-by: Yaliang Wu <[email protected]> Signed-off-by: TrungBui59 <[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
Continue of #1418
Issues Resolved
[List any issues this PR will resolve]
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.