Skip to content

[Backport 2.15] [Tiered Caching] [Bug Fix] Use concurrentMap instead of HashMap to fix Concurrent Modification Exception#14254

Merged
peterzhuamazon merged 2 commits into2.15from
backport/backport-14221-to-2.15
Jun 13, 2024
Merged

[Backport 2.15] [Tiered Caching] [Bug Fix] Use concurrentMap instead of HashMap to fix Concurrent Modification Exception#14254
peterzhuamazon merged 2 commits into2.15from
backport/backport-14221-to-2.15

Conversation

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

Backport ccf5289 from #14221.

…x Concurrent Modification Exception (#14221)

* use concurrentmap

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update CHANGELOG.md

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCache.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* revert feature flags

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* changelog to releaselog

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* use concurrentmap

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update CHANGELOG.md

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCache.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update IndicesRequestCacheTests.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* revert feature flags

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* changelog to releaselog

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* revert the test removal

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* revert the conflict resolutions

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

---------

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
(cherry picked from commit ccf5289)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Copy Markdown
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.

@github-actions
Copy link
Copy Markdown
Contributor

✅ Gradle check result for 6161b48: SUCCESS

@peterzhuamazon
Copy link
Copy Markdown
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
@peterzhuamazon peterzhuamazon deleted the backport/backport-14221-to-2.15 branch June 13, 2024 02:31
@github-actions
Copy link
Copy Markdown
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