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

Make IndicesRequestCacheCleanupIT more robust #14478

Merged

Conversation

kiranprakash154
Copy link
Contributor

@kiranprakash154 kiranprakash154 commented Jun 20, 2024

Description

This is a followup to #14369
and has 3 changes

  • use setup_index in the test testCacheWithInvalidation to keep it consistent with other tests.
  • Increase refresh interval to rule out flakiness by keeping it way high - TimeValue.timeValueDays(1)
  • Increase max wait time to 5 iteration cycles of cache cleanup cycles to consider for events like GC stop the world that is out of control and runs long. This would not increase the test run time since the backoff in assertBusy is logarithmic and should return after all the asserts passes.

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
@kiranprakash154
Copy link
Contributor Author

@andrross can you review this ?

@kiranprakash154 kiranprakash154 changed the title Update IndicesRequestCacheCleanupIT.java Make IndicesRequestCacheCleanupIT more robust Jun 20, 2024
Copy link
Contributor

✅ Gradle check result for 6c9d08f: SUCCESS

@andrross andrross merged commit e8b7913 into opensearch-project:main Jun 20, 2024
69 of 70 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-14478-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e8b7913926a9428a0a737569e6df44cfeff3defb
# Push it to GitHub
git push --set-upstream origin backport/backport-14478-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-14478-to-2.x.

@kiranprakash154
Copy link
Contributor Author

@andrross I will create a manual backport, thanks for merging.

@kiranprakash154 kiranprakash154 deleted the kp/followup-to-flaky-test branch June 20, 2024 21:19
@andrross
Copy link
Member

@kiranprakash154 The backport shouldn't fail unless we've missed a previous one. I don't think there's any reason this code should be different across the main and 2.x branches.

@kiranprakash154 kiranprakash154 added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch backport-failed labels Jun 21, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 21, 2024
Signed-off-by: Kiran Prakash <awskiran@amazon.com>
(cherry picked from commit e8b7913)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@kiranprakash154
Copy link
Contributor Author

kiranprakash154 commented Jun 21, 2024

@kiranprakash154 The backport shouldn't fail unless we've missed a previous one. I don't think there's any reason this code should be different across the main and 2.x branches.

It failed because the previous backport was not merged yet, Jay merged it yesterday - #14482

I retried and looks like the auto backport worked - #14498

andrross pushed a commit that referenced this pull request Jun 21, 2024
(cherry picked from commit e8b7913)

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
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>
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 bug Something isn't working flaky-test Random test failure that succeeds on second run Search:Performance skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants