Remove DiscoveryPlugin#getDiscoveryTypes#38414
Merged
DaveCTurner merged 2 commits intoelastic:masterfrom Feb 5, 2019
Merged
Conversation
With this change we no longer support pluggable discovery implementations. No known implementations of `DiscoveryPlugin` actually override this method, so in practice this should have no effect on the wider world. However, we were using this rather extensively in tests to provide the `test-zen` discovery type. We no longer need a separate discovery type for tests as we no longer need to customise its behaviour. Relates elastic#38410
Collaborator
|
Pinging @elastic/es-distributed |
Member
Author
|
@elasticmachine please run elasticsearch-ci/default-distro |
ywelsch
approved these changes
Feb 5, 2019
| .build(); | ||
| .put(DiscoveryModule.DISCOVERY_TYPE_SETTING.getKey(), DiscoveryModule.ZEN_DISCOVERY_TYPE)).build(); | ||
|
|
||
| private static Settings ZEN2_SETTINGS = Settings.builder() |
Contributor
There was a problem hiding this comment.
should we rename the "zen2" discovery type to "default"? This means no need for the "zen" name anymore
Member
Author
|
@elasticmachine retest this please now that 766f7b5 is in |
DaveCTurner
added a commit
that referenced
this pull request
Feb 5, 2019
Marks `DiscoveryPlugin#getDiscoveryTypes` as deprecated since we intend to remove the ability for plugins to provide their own discovery type in a future version. Relates #38414
Member
Author
|
CI failure due to #37807 - @elasticmachine please run elasticsearch-ci/2. |
Member
Author
|
@elasticmachine please run elasticsearch-ci/packaging-sample |
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Feb 5, 2019
* master: (23 commits) Lift retention lease expiration to index shard (elastic#38380) Make Ccr recovery file chunk size configurable (elastic#38370) Prevent CCR recovery from missing documents (elastic#38237) re-enables awaitsfixed datemath tests (elastic#38376) Types removal fix FullClusterRestartIT warnings (elastic#38445) Make sure to reject mappings with type _doc when include_type_name is false. (elastic#38270) Updates the grok patterns to be consistent with logstash (elastic#27181) Ignore type-removal warnings in XPackRestTestHelper (elastic#38431) testHlrcFromXContent() should respect assertToXContentEquivalence() (elastic#38232) add basic REST test for geohash_grid (elastic#37996) Remove DiscoveryPlugin#getDiscoveryTypes (elastic#38414) Fix the clock resolution to millis in GetWatchResponseTests (elastic#38405) Throw AssertionError when no master (elastic#38432) `if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's CRUD API (elastic#38411) Enable CronEvalToolTest.testEnsureDateIsShownInRootLocale (elastic#38394) Fix failures in BulkProcessorIT#testGlobalParametersAndBulkProcessor. (elastic#38129) SQL: Implement CURRENT_DATE (elastic#38175) Mute testReadRequestsReturnLatestMappingVersion (elastic#38438) [ML] Report index unavailable instead of waiting for lazy node (elastic#38423) Update Rollup Caps to allow unknown fields (elastic#38339) ...
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
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.
With this change we no longer support pluggable discovery implementations. No
known implementations of
DiscoveryPluginactually override this method, so inpractice this should have no effect on the wider world. However, we were using
this rather extensively in tests to provide the
test-zendiscovery type. Weno longer need a separate discovery type for tests as we no longer need to
customise its behaviour.
Relates #38410