Skip to content
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

fix: remove required check on indices.stats.ShardStats.shards #1177

Merged
merged 6 commits into from
Sep 17, 2024

Conversation

LiamMacpherson
Copy link
Contributor

Description

This change addresses the problem wherein we require a field which isn't ever returned inside the "Shards" property on indices stats calls with the level set to "shards".

Issues Resolved

Closes 1174

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.

Copy link
Contributor Author

@LiamMacpherson LiamMacpherson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a comment and reminder

CHANGELOG.md Outdated Show resolved Hide resolved
dblock
dblock previously requested changes Sep 2, 2024
Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Please add a test.

CHANGELOG.md Outdated Show resolved Hide resolved
Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>
Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>
Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>
Copy link
Collaborator

@Xtansia Xtansia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sticking with this @LiamMacpherson, the changes look good, just need to fix the formatting to keep the CI happy.
Could you please run and commit the changes:

./gradlew spotlessApply

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>
@LiamMacpherson
Copy link
Contributor Author

Ah -- I hadn't noticed that failure! Thanks for highlighting @Xtansia!

@Xtansia Xtansia dismissed dblock’s stale review September 17, 2024 11:57

Test has been added

@Xtansia Xtansia merged commit 8a37f3f into opensearch-project:main Sep 17, 2024
56 checks passed
@Xtansia
Copy link
Collaborator

Xtansia commented Sep 17, 2024

Thanks @LiamMacpherson

@Xtansia Xtansia added the backport 2.x Backport to 2.x branch label Sep 17, 2024
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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-1177-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8a37f3f2776f5ef2244382c6bc379747e05f203e
# Push it to GitHub
git push --set-upstream origin backport/backport-1177-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 base branch is 2.x and the compare/head branch is backport/backport-1177-to-2.x.

Xtansia pushed a commit to Xtansia/opensearch-java that referenced this pull request Sep 17, 2024
…arch-project#1177)

* fix: remove required check on indices.stats.ShardStats.shards

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* address review comments re: imports and changelog

Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* add test and remove check in constructor

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* re-remove auto import organisation

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* chore: correct changelog link

Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* spotlessApply tidyup

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

---------

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>
(cherry picked from commit 8a37f3f)
dblock pushed a commit that referenced this pull request Sep 17, 2024
…#1200)

* fix: remove required check on indices.stats.ShardStats.shards

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* address review comments re: imports and changelog

Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* add test and remove check in constructor

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* re-remove auto import organisation

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* chore: correct changelog link

Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

* spotlessApply tidyup

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>

---------

Signed-off-by: Liam Macpherson <Liam.Macpherson@sas.com>
Signed-off-by: Liam Macpherson <LiamMacpherson42@gmail.com>
(cherry picked from commit 8a37f3f)

Co-authored-by: Liam Macpherson <LiamMacpherson42@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] IndicesStatsResponse bug when specifying the Shard Level in the IndicesStatsRequest
4 participants