Skip to content

Commit cf3d83e

Browse files
committed
Use ClusterState.UNKNOWN_VERSION
1 parent 9b12b05 commit cf3d83e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

server/src/main/java/org/elasticsearch/cluster/coordination/FollowersChecker.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.apache.logging.log4j.message.ParameterizedMessage;
2323
import org.elasticsearch.cluster.ClusterName;
24+
import org.elasticsearch.cluster.ClusterState;
2425
import org.elasticsearch.cluster.coordination.Coordinator.Mode;
2526
import org.elasticsearch.cluster.node.DiscoveryNode;
2627
import org.elasticsearch.cluster.node.DiscoveryNodes;
@@ -305,7 +306,7 @@ private void handleWakeUp() {
305306
if (Coordinator.isZen1Node(discoveryNode)) {
306307
actionName = NodesFaultDetection.PING_ACTION_NAME;
307308
transportRequest = new NodesFaultDetection.PingRequest(discoveryNode, ClusterName.CLUSTER_NAME_SETTING.get(settings),
308-
transportService.getLocalNode(), 0L);
309+
transportService.getLocalNode(), ClusterState.UNKNOWN_VERSION);
309310
} else {
310311
actionName = FOLLOWER_CHECK_ACTION_NAME;
311312
transportRequest = request;

server/src/main/java/org/elasticsearch/discovery/PeerFinder.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.lucene.util.SetOnce;
2525
import org.elasticsearch.action.ActionListener;
2626
import org.elasticsearch.cluster.ClusterName;
27+
import org.elasticsearch.cluster.ClusterState;
2728
import org.elasticsearch.cluster.coordination.Coordinator;
2829
import org.elasticsearch.cluster.coordination.PeersResponse;
2930
import org.elasticsearch.cluster.node.DiscoveryNode;
@@ -448,7 +449,8 @@ public String executor() {
448449
if (Coordinator.isZen1Node(discoveryNode)) {
449450
actionName = UnicastZenPing.ACTION_NAME;
450451
transportRequest = new UnicastZenPing.UnicastPingRequest(1, ZenDiscovery.PING_TIMEOUT_SETTING.get(settings),
451-
new ZenPing.PingResponse(getLocalNode(), null, ClusterName.CLUSTER_NAME_SETTING.get(settings), 0L));
452+
new ZenPing.PingResponse(getLocalNode(), null, ClusterName.CLUSTER_NAME_SETTING.get(settings),
453+
ClusterState.UNKNOWN_VERSION));
452454
transportResponseHandler = peersResponseHandler.wrap(ucResponse -> {
453455
Optional<DiscoveryNode> optionalMasterNode = Arrays.stream(ucResponse.pingResponses)
454456
.filter(pr -> discoveryNode.equals(pr.node()) && discoveryNode.equals(pr.master()))
@@ -493,7 +495,8 @@ public void messageReceived(UnicastZenPing.UnicastPingRequest request, Transport
493495
final ClusterName clusterName = ClusterName.CLUSTER_NAME_SETTING.get(settings);
494496
pingResponses.add(new ZenPing.PingResponse(transportService.getLocalNode(), peersResponse.getMasterNode().orElse(null),
495497
clusterName, 0L));
496-
peersResponse.getKnownPeers().forEach(dn -> pingResponses.add(new ZenPing.PingResponse(dn, null, clusterName, 0L)));
498+
peersResponse.getKnownPeers().forEach(dn -> pingResponses.add(
499+
new ZenPing.PingResponse(dn, null, clusterName, ClusterState.UNKNOWN_VERSION)));
497500
channel.sendResponse(new UnicastZenPing.UnicastPingResponse(request.id, pingResponses.toArray(new ZenPing.PingResponse[0])));
498501
}
499502
}

0 commit comments

Comments
 (0)