-
Notifications
You must be signed in to change notification settings - Fork 24.9k
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
Remove DiscoveryPlugin#getDiscoveryTypes #38414
Remove DiscoveryPlugin#getDiscoveryTypes #38414
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
Pinging @elastic/es-distributed |
@elasticmachine please run elasticsearch-ci/default-distro |
.put(TestZenDiscovery.USE_ZEN2.getKey(), false) | ||
.put(TestZenDiscovery.USE_MOCK_PINGS.getKey(), false)) // Zen2 does not know about mock pings | ||
.build(); | ||
.put(DiscoveryModule.DISCOVERY_TYPE_SETTING.getKey(), DiscoveryModule.ZEN_DISCOVERY_TYPE)).build(); | ||
|
||
private static Settings ZEN2_SETTINGS = Settings.builder() |
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.
should we rename the "zen2" discovery type to "default"? This means no need for the "zen" name anymore
@elasticmachine retest this please now that 766f7b5 is in |
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
CI failure due to #37807 - @elasticmachine please run elasticsearch-ci/2. |
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.
Nice, LGTM2
@elasticmachine please run elasticsearch-ci/packaging-sample |
* 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) ...
With this change we no longer support pluggable discovery implementations. No
known implementations of
DiscoveryPlugin
actually 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-zen
discovery type. Weno longer need a separate discovery type for tests as we no longer need to
customise its behaviour.
Relates #38410