Fix issue with ILM that write index was created before template was loaded#9617
Merged
ruflin merged 3 commits intoelastic:masterfrom Dec 18, 2018
Merged
Fix issue with ILM that write index was created before template was loaded#9617ruflin merged 3 commits intoelastic:masterfrom
ruflin merged 3 commits intoelastic:masterfrom
Conversation
778acb5 to
2400d39
Compare
…oaded The write index for ILM was created before the template was loaded. This meant the first template did not contain all the mappings and policy for ILM so was never rolled over. This change makes sure the template is loaded for ILM is setup up and adds a test to confirm it. Further ILM was not respected when running `metricbeat setup --template`. This is now changed too.
ph
approved these changes
Dec 18, 2018
Contributor
ph
left a comment
There was a problem hiding this comment.
Test LGTM to me but I would prefer not having a sleep if possible. :(
| logp.Info("Set settings.index.lifecycle.name in template to %s as ILM is enabled.", ILMPolicyName) | ||
| err = b.Config.Template.SetString("settings.index.lifecycle.name", -1, ILMPolicyName) | ||
| if err != nil { | ||
| return errw.Wrap(err, "error setting settings.index.lifecycle.name") |
Contributor
There was a problem hiding this comment.
Thanks for making the function smaller.
Contributor
Author
There was a problem hiding this comment.
You're welcome, but I think we need further refactoring to make it really nice ;-)
libbeat/tests/system/test_ilm.py
Outdated
| proc.check_kill_and_wait() | ||
|
|
||
| # Give time to do the rollovers | ||
| time.sleep(2) |
Contributor
There was a problem hiding this comment.
I am not a fan of sleep(x) and then assert a condition, probably because I have always ran into issue involving this pattern. I would prefer a fails / sleep / retry mechanism if possible.
Contributor
Author
There was a problem hiding this comment.
Agree, I think I found a nicer solution. See 869637b
ph
approved these changes
Dec 18, 2018
Contributor
|
This is better. |
Contributor
Author
|
jenkins, test this |
ruflin
added a commit
to ruflin/beats
that referenced
this pull request
Dec 18, 2018
…oaded (elastic#9617) The write index for ILM was created before the template was loaded. This meant the first template did not contain all the mappings and policy for ILM so was never rolled over. This change makes sure the template is loaded for ILM is setup up and adds a test to confirm it. Further ILM was not respected when running `metricbeat setup --template`. This is now changed too. (cherry picked from commit 36cee51)
ruflin
added a commit
that referenced
this pull request
Dec 18, 2018
…oaded (#9617) (#9628) The write index for ILM was created before the template was loaded. This meant the first template did not contain all the mappings and policy for ILM so was never rolled over. This change makes sure the template is loaded for ILM is setup up and adds a test to confirm it. Further ILM was not respected when running `metricbeat setup --template`. This is now changed too. (cherry picked from commit 36cee51)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The write index for ILM was created before the template was loaded. This meant the first template did not contain all the mappings and policy for ILM so was never rolled over. This change makes sure the template is loaded for ILM is setup up and adds a test to confirm it.
Further ILM was not respected when running
metricbeat setup --template. This is now changed too.mockbeat was modified to send multiple events instead of just one to allow the new tests.