Skip to content

Conversation

@ywelsch
Copy link
Contributor

@ywelsch ywelsch commented Feb 27, 2019

Some of these commits will also be backported to 7.0/7.x (#39470) as the cluster.coordination package was making use of some things in discovery.zen and we want to keep 7.x as close as possible to master.

Note to reviewer: Easiest to review commit by commit, ignoring 5e4a0e7.

@ywelsch ywelsch added >non-issue :Distributed Coordination/Cluster Coordination Cluster formation and cluster state publication, including cluster membership and fault detection. v8.0.0 labels Feb 27, 2019
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-distributed

@ywelsch ywelsch mentioned this pull request Feb 27, 2019
61 tasks
@ywelsch ywelsch mentioned this pull request Feb 27, 2019
@ywelsch ywelsch requested a review from DaveCTurner February 28, 2019 07:55
Copy link
Contributor

@DaveCTurner DaveCTurner left a comment

Choose a reason for hiding this comment

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

Feels good :)

I left a couple of questions. I also found these remaining mentions of Zen:

* (for example, @see org.elasticsearch.discovery.zen.ping.unicast.UnicastZenPing, which constructs

/**
* The node-level `discovery.zen.minimum_master_nodes` setting on the master node that published this cluster state, for use in rolling
* upgrades from 6.x to 7.x. Once all the 6.x master-eligible nodes have left the cluster, the 7.x nodes use this value to determine how
* many master-eligible nodes must be discovered before the cluster can be bootstrapped. Note that this method returns the node-level
* value of this setting, and ignores any cluster-level override that was set via the API. Callers are expected to combine this value
* with any value set in the cluster-level settings. This should be removed once we no longer need support for {@link Version#V_6_7_0}.
*/
public int getMinimumMasterNodesOnPublishingMaster() {
return minimumMasterNodesOnPublishingMaster;
}

(wasReadFromDiff() below is also unused)

@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE,org.elasticsearch.discovery.zen:TRACE")

@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE,org.elasticsearch.discovery.zen:TRACE")

@ywelsch ywelsch requested a review from DaveCTurner March 1, 2019 13:01
@ywelsch
Copy link
Contributor Author

ywelsch commented Mar 4, 2019

@DaveCTurner this is ready for review again

Copy link
Contributor

@DaveCTurner DaveCTurner left a comment

Choose a reason for hiding this comment

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

Sorry, found some more:

public static final String ZEN_DISCOVERY_TYPE = "legacy-zen";

listSetting("transport.tracer.exclude",
Arrays.asList("internal:discovery/zen/fd*", "internal:coordination/fault_detection/*", TransportLivenessAction.NAME),
Function.identity(), Setting.Property.Dynamic, Setting.Property.NodeScope);

Protocol dissection for Zen discovery, HTTP and the binary protocol

[2018-09-13T12:20:08,355][INFO ][o.e.c.s.MasterService ] [localhost.localdomain] zen-disco-elected-as-master ([0] nodes joined)[, ], reason: master node changed {previous [], current [{localhost.localdomain}{B0aEHNagTiWx7SYj-l4NTw}{hzsQz6CVQMCTpMCVLM4IHg}{127.0.0.1}{127.0.0.1:9300}{testattr=test}]}
[2018-09-13T12:20:08,360][INFO ][o.e.c.s.ClusterApplierService] [localhost.localdomain] master node changed {previous [], current [{localhost.localdomain}{B0aEHNagTiWx7SYj-l4NTw}{hzsQz6CVQMCTpMCVLM4IHg}{127.0.0.1}{127.0.0.1:9300}{testattr=test}]}, reason: apply cluster state (from master [master {localhost.localdomain}{B0aEHNagTiWx7SYj-l4NTw}{hzsQz6CVQMCTpMCVLM4IHg}{127.0.0.1}{127.0.0.1:9300}{testattr=test} committed version [1] source [zen-disco-elected-as-master ([0] nodes joined)[, ]]])

Copy link
Contributor

@DaveCTurner DaveCTurner left a comment

Choose a reason for hiding this comment

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

LGTM

@ywelsch ywelsch merged commit 3b71a31 into elastic:master Mar 4, 2019
ywelsch added a commit that referenced this pull request Mar 4, 2019
Cherry-picks a few commits from #39466 to align 7.x with master branch.
ywelsch added a commit that referenced this pull request Mar 4, 2019
Cherry-picks a few commits from #39466 to align 7.x with master branch.
DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request May 16, 2020
In elastic#39466 we removed all the settings in the `discovery.zen` namespace in 8.0
and documented their removal as a breaking change. Conspicuously absent from
the list of removed settings is the `discovery.zen.minimum_master_nodes`
setting, and there are two other omitted settings and a duplicated one too.
This commit fixes up these docs.
DaveCTurner added a commit that referenced this pull request May 17, 2020
In #39466 we removed all the settings in the `discovery.zen` namespace in 8.0
and documented their removal as a breaking change. Conspicuously absent from
the list of removed settings is the `discovery.zen.minimum_master_nodes`
setting, and there are two other omitted settings and a duplicated one too.
This commit fixes up these docs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Distributed Coordination/Cluster Coordination Cluster formation and cluster state publication, including cluster membership and fault detection. >non-issue v8.0.0-alpha1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants