-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
[CCI] [BUG] Fixing extension settings update consumers #7456
Conversation
Signed-off-by: Kuanysh <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
@Kuanysh-kst Thanks. Care to describe what you're fixing? Add a unit test please. |
Signed-off-by: Kuanysh <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
server/src/main/java/org/opensearch/common/settings/AbstractScopedSettings.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Kuanysh <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Kuanysh Aimurzinov <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
server/src/main/java/org/opensearch/extensions/AddSettingsUpdateConsumerRequestHandler.java
Show resolved
Hide resolved
Gradle check failure unrelated to this PR:
|
Looks similar to #7396 @Kuanysh-kst can you try to rebase your branch? I think that'll fix the gradle check. |
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
@Kuanysh-kst Good news, tests are running. Bad news, test failure:
That's this line: // Should fail as component settings are not registered within cluster settings
assertEquals(false, ((AcknowledgedResponse) response).getStatus()); The code changes status to This seems correlated with this comment saying we should do a null check (and we don't): // do a null check and throw IllegalArgument exception here if neither index or node scope Suggested fix:
|
Signed-off-by: Kuanysh <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #7456 +/- ##
============================================
- Coverage 70.93% 70.93% -0.01%
+ Complexity 56636 56614 -22
============================================
Files 4719 4719
Lines 267559 267574 +15
Branches 39206 39211 +5
============================================
- Hits 189805 189798 -7
- Misses 61714 61730 +16
- Partials 16040 16046 +6
|
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.
Added opensearch-project/opensearch-sdk-java#835 to follow up with SDK integration tests for the lines called out by codecov.
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.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-7456-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 cc67469292bc8d5be1b476fb0fb11e07fe82f8a6
# Push it to GitHub
git push --set-upstream origin backport/backport-7456-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
…oject#7456) * add equels for ClusterSettings Signed-off-by: Kuanysh <[email protected]> * added junit Signed-off-by: Kuanysh <[email protected]> * code refactoring Signed-off-by: Kuanysh <[email protected]> * added changes to handleAddSettingsUpdateConsumer Signed-off-by: Kuanysh <[email protected]> * code refactoring Signed-off-by: Kuanysh Aimurzinov <[email protected]> * code refactoring Signed-off-by: Kuanysh Aimurzinov <[email protected]> * changed main method Signed-off-by: Kuanysh <[email protected]> --------- Signed-off-by: Kuanysh <[email protected]> Signed-off-by: Kuanysh <[email protected]> Signed-off-by: Kuanysh Aimurzinov <[email protected]>
…oject#7456) * add equels for ClusterSettings Signed-off-by: Kuanysh <[email protected]> * added junit Signed-off-by: Kuanysh <[email protected]> * code refactoring Signed-off-by: Kuanysh <[email protected]> * added changes to handleAddSettingsUpdateConsumer Signed-off-by: Kuanysh <[email protected]> * code refactoring Signed-off-by: Kuanysh Aimurzinov <[email protected]> * code refactoring Signed-off-by: Kuanysh Aimurzinov <[email protected]> * changed main method Signed-off-by: Kuanysh <[email protected]> --------- Signed-off-by: Kuanysh <[email protected]> Signed-off-by: Kuanysh <[email protected]> Signed-off-by: Kuanysh Aimurzinov <[email protected]> Signed-off-by: Rishab Nahata <[email protected]>
…oject#7456) * add equels for ClusterSettings Signed-off-by: Kuanysh <[email protected]> * added junit Signed-off-by: Kuanysh <[email protected]> * code refactoring Signed-off-by: Kuanysh <[email protected]> * added changes to handleAddSettingsUpdateConsumer Signed-off-by: Kuanysh <[email protected]> * code refactoring Signed-off-by: Kuanysh Aimurzinov <[email protected]> * code refactoring Signed-off-by: Kuanysh Aimurzinov <[email protected]> * changed main method Signed-off-by: Kuanysh <[email protected]> --------- Signed-off-by: Kuanysh <[email protected]> Signed-off-by: Kuanysh <[email protected]> Signed-off-by: Kuanysh Aimurzinov <[email protected]> Signed-off-by: Shivansh Arora <[email protected]>
Description
added equals to the method to remove the bug, which appears in the addSettingsUpdateConsumer() method
Related Issues
opensearch-project/opensearch-sdk-java#366
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.