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 integer overflow for remaining index stats #960

Merged
merged 11 commits into from
Apr 30, 2024

Conversation

oksanay
Copy link
Contributor

@oksanay oksanay commented Apr 30, 2024

Description

Changed data types in QueryCacheStats object to be longs
Example of the data which is having problem when datatypes are integers
"query_cache" : {
"memory_size_in_bytes" : 892496036,
"total_count" : 8757938874,
"hit_count" : 347443703,
"miss_count" : 8410495171,
"cache_size" : 18507,
"cache_count" : 169300,
"evictions" : 150793
}

Issues Resolved

#959

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
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.

Look at the failure log, it fails on :java-client:spotlessJavaCheck. It's just a formatting problem, to fix run ./gradlew :java-client:spotlessApply.

CHANGELOG.md Show resolved Hide resolved
oksanay added 6 commits April 29, 2024 20:32
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
@oksanay oksanay requested a review from dblock April 30, 2024 03:44
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!

CHANGELOG.md Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
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.

CHANGELOG needs fixing.

CHANGELOG.md Outdated
@@ -26,7 +26,10 @@ This section is for maintaining a changelog for all breaking changes for the cli
- Delete shape property ([#884](https://github.com/opensearch-project/opensearch-java/pull/885))

### Fixed
- Fix version and build ([#254](https://github.com/opensearch-project/opensearch-java/pull/254))
- Fix version and build ([#254](https://github.com/opensearch-project/opensearcjava/pull/254))
Copy link
Member

Choose a reason for hiding this comment

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

There's a typo in opensearch-java here, so the link checker caught it and that's why the build failed.

Copy link
Member

Choose a reason for hiding this comment

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

This link is still incorrect, #254 is the correct one.

Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
@oksanay oksanay requested a review from dblock April 30, 2024 15:58
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
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.

One more.

CHANGELOG.md Outdated Show resolved Hide resolved
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
@oksanay oksanay requested a review from dblock April 30, 2024 16:48
dblock
dblock previously approved these changes Apr 30, 2024
Signed-off-by: oksanay <oksana.yakusheva@hpe.com>
@oksanay
Copy link
Contributor Author

oksanay commented Apr 30, 2024

@dblock I pushed change to test-unit.yml

@dblock
Copy link
Member

dblock commented Apr 30, 2024

@oksanay First, thank you for fixing this! Let's get this passing and merged.

Open an issue like #949 for a release, referencing this issue, we can do this quickly.

@oksanay
Copy link
Contributor Author

oksanay commented Apr 30, 2024

@dblock now all checks passed

@dblock dblock merged commit f0797da into opensearch-project:main Apr 30, 2024
49 checks passed
@dblock dblock added the backport 2.x Backport to 2.x branch label Apr 30, 2024
@opensearch-trigger-bot
Copy link
Contributor

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-960-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f0797da1ac1715884d7f105b6507012a53a9b374
# Push it to GitHub
git push --set-upstream origin backport/backport-960-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-960-to-2.x.

@dblock
Copy link
Member

dblock commented Apr 30, 2024

@oksanay Looks like this will need a manual backport to the 2.x branch, please? I believe we release from that (@VachaShah can correct me if I am wrong).

@VachaShah
Copy link
Collaborator

Thats right @dblock! We release a new minor or patch version from the 2.x branch.

@oksanay
Copy link
Contributor Author

oksanay commented Apr 30, 2024

@dblock and @VachaShah so do I need to open the issue for the release or not?

@oksanay
Copy link
Contributor Author

oksanay commented Apr 30, 2024

and do I need to run this manual backport stuff?

@dblock
Copy link
Member

dblock commented Apr 30, 2024

@oksanay Yes. We have an automated workflow that works most of the time, but it failed here because it caused a conflict that needs to be manually resolved.

@dblock
Copy link
Member

dblock commented Apr 30, 2024

@dblock and @VachaShah so do I need to open the issue for the release or not?

Yes, please.

You have to do both the backport and open a release ticket if you need a release faster than "whenever".

@oksanay
Copy link
Contributor Author

oksanay commented Apr 30, 2024

It should be 2.11.1, right?

@oksanay
Copy link
Contributor Author

oksanay commented Apr 30, 2024

@dblock @VachaShah ^ ?

@dblock
Copy link
Member

dblock commented Apr 30, 2024

This is a bug fix on 2.10.1, so it should be 2.10.2.

We will also need to move the CHANGELOG entry accordingly when we release.

@oksanay
Copy link
Contributor Author

oksanay commented Apr 30, 2024

@dblock This command is failing with any combination of 2,10
git worktree add ../.worktrees/backport-2.10.1 2.10.1
I tried 2.10.1, 2.10.2 2.10. Sorry I am so noisy

@dblock
Copy link
Member

dblock commented Apr 30, 2024

@oksanay The easiest way is to just re-apply your commit to the 2.x branch.

In your fork:

git checkout 2.x
git pull upstream 2.x
git checkout -b 2.x-backport-960
git cherry-pick f0797da1ac1715884d7f105b6507012a53a9b374
# fix conflicts, commit
git push origin 2.x-backport-960
# make PR into 2.x

If you're struggling I can do it quickly.

@oksanay
Copy link
Contributor Author

oksanay commented Apr 30, 2024

@dblock YES, please! I have a deadline today with my own stuff and I AM struggling

dblock pushed a commit to dblock/opensearch-java that referenced this pull request Apr 30, 2024
dblock pushed a commit to dblock/opensearch-java that referenced this pull request Apr 30, 2024
@dblock
Copy link
Member

dblock commented Apr 30, 2024

#965

@dblock dblock mentioned this pull request Apr 30, 2024
@dblock
Copy link
Member

dblock commented Apr 30, 2024

I opened a release proposal ticket in #966.

@oksanay
Copy link
Contributor Author

oksanay commented Apr 30, 2024

Thank you so much!!!!

dblock added a commit that referenced this pull request Apr 30, 2024
Signed-off-by: dblock <dblock@amazon.com>
Co-authored-by: Oksana Yakusheva <oksanay@cloudcruiser.com>
@BrendonFaleiro BrendonFaleiro mentioned this pull request Jun 21, 2024
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.

3 participants