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

Have a dedicated join timeout that is higher than ping.timeout for join #6342

Closed
wants to merge 1 commit into from
Closed

Have a dedicated join timeout that is higher than ping.timeout for join #6342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java
View file
Open in desktop
Expand Up @@ -93,6 +93,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implemen


private final TimeValue pingTimeout;
private final TimeValue joinTimeout;

// a flag that should be used only for testing
private final boolean sendLeaveRequest;
Expand Down Expand Up @@ -134,12 +135,13 @@ public ZenDiscovery(Settings settings, ClusterName clusterName, ThreadPool threa

// also support direct discovery.zen settings, for cases when it gets extended
this.pingTimeout = settings.getAsTime("discovery.zen.ping.timeout", settings.getAsTime("discovery.zen.ping_timeout", componentSettings.getAsTime("ping_timeout", componentSettings.getAsTime("initial_ping_timeout", timeValueSeconds(3)))));
this.joinTimeout = settings.getAsTime("discovery.zen.join_timeout", TimeValue.timeValueMillis(pingTimeout.millis() * 10));
this.sendLeaveRequest = componentSettings.getAsBoolean("send_leave_request", true);

this.masterElectionFilterClientNodes = settings.getAsBoolean("discovery.zen.master_election.filter_client", true);
this.masterElectionFilterDataNodes = settings.getAsBoolean("discovery.zen.master_election.filter_data", false);

logger.debug("using ping.timeout [{}], master_election.filter_client [{}], master_election.filter_data [{}]", pingTimeout, masterElectionFilterClientNodes, masterElectionFilterDataNodes);
logger.debug("using ping.timeout [{}], join.timeout [{}], master_election.filter_client [{}], master_election.filter_data [{}]", pingTimeout, joinTimeout, masterElectionFilterClientNodes, masterElectionFilterDataNodes);

this.electMaster = new ElectMasterService(settings);
nodeSettingsService.addListener(new ApplySettings());
Expand Down Expand Up @@ -343,7 +345,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
}
// send join request
try {
membership.sendJoinRequestBlocking(masterNode, localNode, pingTimeout);
membership.sendJoinRequestBlocking(masterNode, localNode, joinTimeout);
} catch (Exception e) {
if (e instanceof ElasticsearchException) {
logger.info("failed to send join request to master [{}], reason [{}]", masterNode, ((ElasticsearchException) e).getDetailedMessage());
Expand Down Expand Up @@ -713,7 +715,7 @@ private ClusterState handleJoinRequest(final DiscoveryNode node) {

// validate the join request, will throw a failure if it fails, which will get back to the
// node calling the join request
membership.sendValidateJoinRequestBlocking(node, state, pingTimeout);
membership.sendValidateJoinRequestBlocking(node, state, joinTimeout);

clusterService.submitStateUpdateTask("zen-disco-receive(join from node[" + node + "])", Priority.IMMEDIATE, new ClusterStateUpdateTask() {
@Override
Expand Down