-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Shrink API should ignore templates #25380
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
Conversation
|
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
|
I don't know enough about this to properly review, but I think there should be a unit test, not a rest test. /cc @jasontedor @elasticmachine ok to test |
|
@rjernst Unit test requires converting anonymous class to inner class. @jasontedor recommended to fix bug first and then make this code unit testable. You can view initial PR with unit test in #25373 |
|
Thanks @fred84, I'll review this next week. |
|
test this please |
* master: (181 commits) Use a non default port range in MockTransportService Add a shard filter search phase to pre-filter shards based on query rewriting (elastic#25658) Prevent excessive disk consumption by log files Migrate RestHttpResponseHeadersIT to ESRestTestCase (elastic#25675) Use config directory to find jvm.options Fix inadvertent rename of systemd tests Adding basic search request documentation for high level client (elastic#25651) Disallow lang to be used with Stored Scripts (elastic#25610) Fix typo in ScriptDocValues deprecation warnings (elastic#25672) Changes DocValueFieldsFetchSubPhase to reuse doc values iterators for multiple hits (elastic#25644) Query range fields by doc values when they are expected to be more efficient than points. Remove SearchHit#internalHits (elastic#25653) [DOCS] Reorganized the highlighting topic so it's less confusing. Add an underscore to flood stage setting Avoid failing install if system-sysctl is masked Add another parent value option to join documentation (elastic#25609) Ensure we rewrite common queries to `match_none` if possible (elastic#25650) Remove reference to field-stats docs. Optimize the order of bytes in uuids for better compression. (elastic#24615) Fix BytesReferenceStreamInput#skip with offset (elastic#25634) ...
|
retest this please |
jasontedor
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
|
Thank you @fred84! |
|
@jasontedor This should be backported to 5.6, no? |
A shrunk index should ignore anything from templates and instead take its mappings, aliases, and settings from the original index, plus any new settings and aliases passed in with the shrink request. This commit causes this to be the case. Relates #25380
|
@clintongormley I backported this in 4df868f. |
This commit adjusts the skip version for a shrink index test that ensures that a shrunken index ignores templates; the version can be adjusted after the fix was backported targeting 5.6.0 and later. Relates #25380
|
So, is there a workaround for 5.3? |
|
You could remove the offending template, execute the shrink, and then put the template back. |
@jasontedor fix only for #25035