Skip to content

[7.x] Avoid race condition in ILMHistorySotre (#53039)#53094

Merged
probakowski merged 5 commits intoelastic:7.xfrom
probakowski:backport/7.x/pr-53039
Mar 9, 2020
Merged

[7.x] Avoid race condition in ILMHistorySotre (#53039)#53094
probakowski merged 5 commits intoelastic:7.xfrom
probakowski:backport/7.x/pr-53039

Conversation

@probakowski
Copy link
Copy Markdown
Contributor

Backports the following commits to 7.x:

* Avoid race condition in ILMHistorySotre

This change modifies ILMHistoryStore to always apply correct settings and mappings,
even if template is deleted and not yet recreated. This ensures that ILM history index
is correctly managed by ILM and also fixes flaky history tests that were prone to
triggenring this race.

This commit also refactors and simplifies ILM history tests.

Closes elastic#50353 and elastic#52853

* Review comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@probakowski
Copy link
Copy Markdown
Contributor Author

@elasticmachine update branch

@probakowski
Copy link
Copy Markdown
Contributor Author

@elasticmachine update branch

@probakowski probakowski merged commit f075d70 into elastic:7.x Mar 9, 2020
@probakowski probakowski deleted the backport/7.x/pr-53039 branch March 9, 2020 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants