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 array hashCode calculation in ResyncReplicationRequest #16378

Merged
merged 2 commits into from
Oct 19, 2024

Conversation

dk2k
Copy link
Contributor

@dk2k dk2k commented Oct 18, 2024

…de(). Added unit test
Previous reincarnation of this PR #15383

Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

Code changes LGTM (see also review on previous PR).

Will let CI finish and another maintainer review before merging.

Copy link
Contributor

❌ Gradle check result for 926e186: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@dk2k
Copy link
Contributor Author

dk2k commented Oct 18, 2024

I think rebase failed again
There are 5 changed file in this PR now. I changed only 3

Copy link
Contributor

❌ Gradle check result for a2772d0: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@dbwiddis
Copy link
Member

I think rebase failed again There are 5 changed file in this PR now. I changed only 3

Race condition. :)

In this particular edge case, I merged a PR in between your rebase and pushing your PR.

I just reverted the disk usage PR so that line is no longer in the changelog and the Bootstrap file changes aren't there either.

Normally this wouldn't be a problem, but since the commit with the changelog issue is adjacent to your changelog entry the merge conflict prevents GitHub from automatically resolving it.

I recognize it's frustrating and there's an open issue #15149 discussing improving how we handle the changelog.

…de(). Added unit test

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
@dbwiddis dbwiddis force-pushed the dk2k_hash_for_array branch from a2772d0 to fa9e422 Compare October 18, 2024 14:45
Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
@dbwiddis dbwiddis force-pushed the dk2k_hash_for_array branch from fa9e422 to ec72491 Compare October 18, 2024 14:48
@dbwiddis dbwiddis changed the title Array, passed to Objects.hash(), should be wrapped into Arrays.hashCo… Fix array hashCode calculation in ResyncReplicationRequest Oct 18, 2024
@dbwiddis dbwiddis added the backport 2.x Backport to 2.x branch label Oct 18, 2024
Copy link
Contributor

❌ Gradle check result for ec72491: null

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

❌ Gradle check result for ec72491: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

✅ Gradle check result for ec72491: SUCCESS

Copy link

codecov bot commented Oct 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.06%. Comparing base (0bded88) to head (ec72491).
Report is 4 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #16378      +/-   ##
============================================
- Coverage     72.07%   72.06%   -0.01%     
- Complexity    64819    64821       +2     
============================================
  Files          5307     5307              
  Lines        302718   302722       +4     
  Branches      43734    43735       +1     
============================================
- Hits         218178   218169       -9     
+ Misses        66638    66621      -17     
- Partials      17902    17932      +30     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dbwiddis dbwiddis merged commit 0f7d572 into opensearch-project:main Oct 19, 2024
43 of 44 checks passed
@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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-16378-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0f7d572da1d2dec4c2b83c6ae2c9e47ce38edd00
# Push it to GitHub
git push --set-upstream origin backport/backport-16378-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-16378-to-2.x.

dbwiddis pushed a commit to dbwiddis/OpenSearch that referenced this pull request Oct 19, 2024
…h-project#16378)

* Array, passed to Objects.hash(), should be wrapped into Arrays.hashCode(). Added unit test

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Updated CHANGELOG.md

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
dbwiddis pushed a commit to dbwiddis/OpenSearch that referenced this pull request Oct 19, 2024
…h-project#16378)

* Array, passed to Objects.hash(), should be wrapped into Arrays.hashCode(). Added unit test

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Updated CHANGELOG.md

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
dk2k added a commit to dk2k/OpenSearch that referenced this pull request Oct 21, 2024
…h-project#16378)

* Array, passed to Objects.hash(), should be wrapped into Arrays.hashCode(). Added unit test

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Updated CHANGELOG.md

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
dblock pushed a commit that referenced this pull request Oct 21, 2024
…16389)

* Array, passed to Objects.hash(), should be wrapped into Arrays.hashCode(). Added unit test



* Updated CHANGELOG.md



---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
Co-authored-by: Dmitry Kryukov <dk2k@ya.ru>
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 backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants