Prevent flaky behavior when determining if an request will be executed on the current node. #3066
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
DarshitChanpura
requested review from
cliu123,
cwperks,
davidlago,
peternied,
RyanL1997,
stephen-crawford,
reta and
willyborankin
as code owners
Codecov Report
@@ Coverage Diff @@
## main #3066 +/- ##
============================================
- Coverage 62.54% 62.36% -0.18%
+ Complexity 3361 3347 -14
============================================
Files 254 254
Lines 19744 19741 -3
Branches 3334 3334
============================================
- Hits 12349 12312 -37
- Misses 5768 5793 +25
- Partials 1627 1636 +9
|
DarshitChanpura
commented
Jul 28, 2023
src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
Outdated
Show resolved
Hide resolved
cwperks
reviewed
Jul 31, 2023
Signed-off-by: Peter Nied <[email protected]>
peternied
force-pushed
the
remove-static-localnode-reference
branch
from
a286662 to
871c58f
Compare
peternied
reviewed
Jul 31, 2023
| @@ -130,7 +130,8 @@ public <T extends TransportResponse> void sendRequestDecorate( | |||
| String action, | |||
| TransportRequest request, | |||
| TransportRequestOptions options, | |||
| TransportResponseHandler<T> handler | |||
| TransportResponseHandler<T> handler, | |||
| DiscoveryNode localNode | |||
There was a problem hiding this comment.
Making this a parameter for sendRequestDecorate makes more sense IMO
cwperks
approved these changes
Jul 31, 2023
peternied
approved these changes
Jul 31, 2023
peternied
reviewed
Jul 31, 2023
| @@ -165,7 +162,7 @@ public void testSendRequestDecorate() { | |||
| assertEquals(threadPool.getThreadContext().getHeader(ConfigConstants.OPENDISTRO_SECURITY_USER_HEADER), null); | |||
|
|
|||
| // isSameNodeRequest = false | |||
| securityInterceptor.sendRequestDecorate(sender, connection2, action, request, options, handler); | |||
| securityInterceptor.sendRequestDecorate(sender, connection2, action, request, options, handler, otherNode); | |||
There was a problem hiding this comment.
This check is now fully deterministic 👍
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jul 31, 2023
### Description Remove static reference/initialization of localNode variable inside security plugin, to fix `No user found..` errors caused due to mismatching localNode values in test. Signed-off-by: Peter Nied <[email protected]> Co-authored-by: Peter Nied <[email protected]> (cherry picked from commit cca77be)
willyborankin
pushed a commit
that referenced
this pull request
Jul 31, 2023
Backport cca77be from #3066 Co-authored-by: Darshit Chanpura <[email protected]>
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Aug 8, 2023
### Description Remove static reference/initialization of localNode variable inside security plugin, to fix `No user found..` errors caused due to mismatching localNode values in test. Signed-off-by: Peter Nied <[email protected]> Co-authored-by: Peter Nied <[email protected]> (cherry picked from commit cca77be) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
DarshitChanpura
pushed a commit
that referenced
this pull request
Aug 9, 2023
Backport cca77be from #3066. Signed-off-by: Peter Nied <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Peter Nied <[email protected]>
3 tasks
peternied
changed the title
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
Remove static reference/initialization of localNode variable inside security plugin, to fix
No user found..errors caused due to mismatching localNode values in test.Solve CI flakiness introduced in: #2765
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.