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

[Backport 2.x][Tiered Caching] Moving query recomputation logic outside of write lock #14565

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

sgup432
Copy link
Contributor

@sgup432 sgup432 commented Jun 26, 2024

Description

[Describe what this change achieves]

Related Issues

Resolves #14187

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.

…ck (opensearch-project#14187)

* Moving query recompute out of write lock

Signed-off-by: Sagar Upadhyaya <[email protected]>

* [Tiered Caching] Moving query recomputation logic outside of write lock

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Adding java doc for the completable map

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Changes to call future handler only once per key

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Fixing spotless check

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Added changelog

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Addressing comments

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Fixing gradle fail

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Addressing comments to refactor unit test

Signed-off-by: Sagar Upadhyaya <[email protected]>

* minor UT refactor

Signed-off-by: Sagar Upadhyaya <[email protected]>

---------

Signed-off-by: Sagar Upadhyaya <[email protected]>
Signed-off-by: Sagar <[email protected]>
Co-authored-by: Sagar Upadhyaya <[email protected]>
@sgup432 sgup432 changed the title [Tiered Caching] Moving query recomputation logic outside of write lock [Backport 2.x][Tiered Caching] Moving query recomputation logic outside of write lock Jun 26, 2024
@sgup432
Copy link
Contributor Author

sgup432 commented Jun 26, 2024

@sohami @andrross Need help on this one

Copy link
Contributor

❕ Gradle check result for b2e13dd: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Jun 26, 2024

Codecov Report

Attention: Patch coverage is 93.02326% with 3 lines in your changes missing coverage. Please review.

Project coverage is 71.46%. Comparing base (f2d8e1d) to head (b2e13dd).
Report is 1 commits behind head on 2.x.

Files Patch % Lines
...search/cache/common/tier/TieredSpilloverCache.java 93.02% 2 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #14565      +/-   ##
============================================
+ Coverage     71.39%   71.46%   +0.06%     
- Complexity    62268    62339      +71     
============================================
  Files          5102     5102              
  Lines        293130   293169      +39     
  Branches      42715    42721       +6     
============================================
+ Hits         209275   209508     +233     
+ Misses        66203    66055     -148     
+ Partials      17652    17606      -46     

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

@jed326 jed326 merged commit d21fd36 into opensearch-project:2.x Jun 27, 2024
53 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:

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

@jed326 jed326 removed backport 2.x Backport to 2.x branch backport-failed labels Jun 27, 2024
kkewwei pushed a commit to kkewwei/OpenSearch that referenced this pull request Jul 24, 2024
…ck (opensearch-project#14187) (opensearch-project#14565)

* Moving query recompute out of write lock

* [Tiered Caching] Moving query recomputation logic outside of write lock

* Adding java doc for the completable map

* Changes to call future handler only once per key

* Fixing spotless check

* Added changelog

* Addressing comments

* Fixing gradle fail

* Addressing comments to refactor unit test

* minor UT refactor

---------

Signed-off-by: Sagar Upadhyaya <[email protected]>
Signed-off-by: Sagar <[email protected]>
Co-authored-by: Sagar Upadhyaya <[email protected]>
Signed-off-by: kkewwei <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants