Skip to content

Conversation

@fred84
Copy link
Contributor

@fred84 fred84 commented Jun 23, 2017

@jasontedor fix only for #25035

@elasticmachine
Copy link
Collaborator

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?

@rjernst
Copy link
Member

rjernst commented Jun 26, 2017

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 rjernst added the review label Jun 26, 2017
@fred84
Copy link
Contributor Author

fred84 commented Jun 27, 2017

@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

@jasontedor
Copy link
Member

Thanks @fred84, I'll review this next week.

@jasontedor
Copy link
Member

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)
  ...
@jasontedor
Copy link
Member

retest this please

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@jasontedor jasontedor merged commit e2bfb35 into elastic:master Jul 12, 2017
@jasontedor
Copy link
Member

Thank you @fred84!

@fred84 fred84 deleted the 25035_shrink_api_fix_only branch July 13, 2017 05:26
@clintongormley clintongormley added :Data Management/Indices APIs APIs to create and manage indices and templates >bug v6.0.0 labels Jul 13, 2017
@clintongormley
Copy link
Contributor

@jasontedor This should be backported to 5.6, no?

jasontedor pushed a commit that referenced this pull request Jul 17, 2017
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
@jasontedor
Copy link
Member

@clintongormley I backported this in 4df868f.

jasontedor added a commit that referenced this pull request Jul 17, 2017
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
@DennisDyallo
Copy link

So, is there a workaround for 5.3?

@jasontedor
Copy link
Member

You could remove the offending template, execute the shrink, and then put the template back.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

>bug :Data Management/Indices APIs APIs to create and manage indices and templates v5.6.0 v6.0.0-beta1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants