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.15] [Tiered Caching] [Bug Fix] Use concurrentMap instead of HashMap to fix Concurrent Modification Exception #14254

Merged
merged 2 commits into from
Jun 13, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport ccf5289 from #14221.

…x Concurrent Modification Exception (#14221)

* use concurrentmap

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCache.java

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <[email protected]>

* revert feature flags

Signed-off-by: Kiran Prakash <[email protected]>

* changelog to releaselog

Signed-off-by: Kiran Prakash <[email protected]>

* use concurrentmap

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCache.java

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <[email protected]>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <[email protected]>

* revert feature flags

Signed-off-by: Kiran Prakash <[email protected]>

* changelog to releaselog

Signed-off-by: Kiran Prakash <[email protected]>

* revert the test removal

Signed-off-by: Kiran Prakash <[email protected]>

* revert the conflict resolutions

Signed-off-by: Kiran Prakash <[email protected]>

---------

Signed-off-by: Kiran Prakash <[email protected]>
(cherry picked from commit ccf5289)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@peterzhuamazon
Copy link
Member

peterzhuamazon commented Jun 13, 2024

We will use the status of https://github.com/opensearch-project/OpenSearch/actions/runs/9492219762/job/26158995619 on 6161b48 as the last commit a099a47 is just a changelog merge conflict resolve due to #14251.

Copy link
Contributor

✅ Gradle check result for 6161b48: SUCCESS

@peterzhuamazon
Copy link
Member

✅ Gradle check result for 6161b48: SUCCESS

Merging as the original backport commit passed checks.

@peterzhuamazon peterzhuamazon merged commit b79fedc into 2.15 Jun 13, 2024
28 checks passed
@peterzhuamazon peterzhuamazon deleted the backport/backport-14221-to-2.15 branch June 13, 2024 02:31
Copy link
Contributor

✅ Gradle check result for a099a47: SUCCESS

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