Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Rename static Zen1 settings #38333

Merged
merged 7 commits into from
Feb 5, 2019
Merged

Rename static Zen1 settings #38333

merged 7 commits into from
Feb 5, 2019

Conversation

DaveCTurner
Copy link
Contributor

@DaveCTurner DaveCTurner commented Feb 4, 2019 •
edited
Loading

Renames the following settings to remove the mention of zen in their names:

  • discovery.zen.hosts_provider -> discovery.seed_providers
  • discovery.zen.ping.unicast.concurrent_connects -> discovery.seed_resolver.max_concurrent_resolvers
  • discovery.zen.ping.unicast.hosts.resolve_timeout -> discovery.seed_resolver.timeout
  • discovery.zen.ping.unicast.hosts -> discovery.seed_hosts

The old names are still supported, but deprecated, and we reject attempts to
use both old and new names at the same time.

@DaveCTurner
Rename static Zen1 settings
c7f4173 
Renames the following settings to remove the mention of `zen` in their names:

- `discovery.zen.hosts_provider` -> `discovery.seed_providers`
- `discovery.zen.ping.unicast.concurrent_connects` -> `discovery.seed_resolver.max_concurrent_resolvers`
- `discovery.zen.ping.unicast.hosts.resolve_timeout` -> `discovery.seed_resolver.timeout`
- `discovery.zen.ping.unicast.hosts` -> `discovery.seed_addresses`
@DaveCTurner DaveCTurner added >non-issue WIP v7.0.0 :Distributed/Cluster Coordination Cluster formation and cluster state publication, including cluster membership and fault detection. labels Feb 4, 2019
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-distributed

@ywelsch ywelsch mentioned this pull request Feb 4, 2019
Closed
61 tasks
@DaveCTurner
Copy link
Contributor Author

@elasticmachine run elasticsearch-ci/1

@DaveCTurner DaveCTurner removed the WIP label Feb 4, 2019
ywelsch
ywelsch approved these changes Feb 4, 2019
View reviewed changes
docs/reference/modules/network.asciidoc
+
Defaults to `["127.0.0.1", "[::1]"]`.
existent IP addresses will throw exceptions and cause another DNS lookup on the
next round of pinging (subject to JVM DNS caching). + Defaults to
Copy link
Contributor

Choose a reason for hiding this comment

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

there is a + here

server/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java
}
});
BiConsumer<DiscoveryNode, ClusterState> joinValidator = plugin.getJoinValidator();
if (joinValidator != null) {
joinValidators.add(joinValidator);
}
}
List<String> hostsProviderNames = DISCOVERY_HOSTS_PROVIDER_SETTING.get(settings);

List<String> hostsProviderNames = getSeedProviderNames(settings);
Copy link
Contributor

Choose a reason for hiding this comment

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

rename this variable as well?

server/src/main/java/org/elasticsearch/discovery/UnicastConfiguredHostsResolver.java
@@ -41,8 +41,6 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;

import static org.elasticsearch.discovery.zen.UnicastZenPing.DISCOVERY_ZEN_PING_UNICAST_CONCURRENT_CONNECTS_SETTING;

public class UnicastConfiguredHostsResolver extends AbstractLifecycleComponent implements ConfiguredHostsResolver {
Copy link
Contributor

Choose a reason for hiding this comment

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

we can rename these classes in a follow-up

server/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java
Setting.positiveTimeSetting("discovery.zen.ping.unicast.hosts.resolve_timeout", TimeValue.timeValueSeconds(5),
Property.NodeScope, Property.Deprecated);

public static final Setting<Integer> DISCOVERY_SEED_RESOLVER_MAX_CONCURRENT_RESOLVERS_SETTING =
Copy link
Contributor

Choose a reason for hiding this comment

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

a bit ugly that we have to define this new setting in this class that's going away. We can clean that up later though when removing Zen1

@DaveCTurner DaveCTurner merged commit 2d114a0 into elastic:master Feb 5, 2019
@DaveCTurner DaveCTurner deleted the 2019-02-04-rename-static-zen-settings branch February 5, 2019 08:46
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Feb 5, 2019
@jasontedor
Merge branch 'master' into simplify-retention-lease-expiration
ff9520e 
* master:
  Mute failing API key integration test (elastic#38409)
  Change the milliseconds precision to 3 digits for intervals. (elastic#38297)
  SecuritySettingsSource license.self_generated: trial (elastic#38233)
  Rename no-master-block setting (elastic#38350)
  Rename static Zen1 settings (elastic#38333)
  Migration doc for audit json log file (elastic#38165)
  Add apm_user reserved role (elastic#38206)
DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request Feb 6, 2019
@DaveCTurner
Align docs etc with new discovery setting names
c014dcf 
In elastic#38333 and elastic#38350 we moved away from the `discovery.zen` settings namespace
since these settings have an effect even though Zen Discovery itself is being
phased out. This change aligns the documentation and the names of related
classes and methods with the newly-introduced naming conventions.
@DaveCTurner DaveCTurner mentioned this pull request Feb 6, 2019
Merged
DaveCTurner added a commit that referenced this pull request Feb 6, 2019
@DaveCTurner
Align docs etc with new discovery setting names (#38492)
5a3c452 
In #38333 and #38350 we moved away from the `discovery.zen` settings namespace
since these settings have an effect even though Zen Discovery itself is being
phased out. This change aligns the documentation and the names of related
classes and methods with the newly-introduced naming conventions.
DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request Oct 7, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated
03be471 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates elastic#38289 elastic#38333 elastic#38350 elastic#37868
@DaveCTurner DaveCTurner mentioned this pull request Oct 7, 2021
Merged
DaveCTurner added a commit that referenced this pull request Oct 7, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated (#78824)
f0a8842 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates #38289 #38333 #38350 #37868
DaveCTurner added a commit that referenced this pull request Oct 10, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated (#78824)
082c6f8 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates #38289 #38333 #38350 #37868
DaveCTurner added a commit that referenced this pull request Oct 10, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated (#78824)
60ea35d 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates #38289 #38333 #38350 #37868
DaveCTurner added a commit that referenced this pull request Oct 10, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated (#78824)
3746d97 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates #38289 #38333 #38350 #37868
DaveCTurner added a commit that referenced this pull request Oct 10, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated (#78824)
7f69ac3 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates #38289 #38333 #38350 #37868
DaveCTurner added a commit that referenced this pull request Oct 10, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated (#78824)
88da0a7 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates #38289 #38333 #38350 #37868
DaveCTurner added a commit that referenced this pull request Oct 10, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated (#78824)
710454c 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates #38289 #38333 #38350 #37868
DaveCTurner added a commit that referenced this pull request Oct 10, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated (#78824)
8089410 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates #38289 #38333 #38350 #37868
DaveCTurner added a commit that referenced this pull request Oct 10, 2021
@DaveCTurner
Document that discovery.zen.* settings are deprecated (#78824)
ddb8c23 
Zen discovery and its associated settings were deprecated in 7.0. This
commit adds an entry to the release notes calling this out.

Relates #38289 #38333 #38350 #37868
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ywelsch ywelsch ywelsch approved these changes

Assignees
No one assigned
Labels
:Distributed/Cluster Coordination Cluster formation and cluster state publication, including cluster membership and fault detection. >non-issue v7.0.0-beta1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DaveCTurner @elasticmachine @ywelsch @colings86