From 187b233571073e27f4ba04d0b05595cc1e7b53ce Mon Sep 17 00:00:00 2001 From: David Turner Date: Thu, 24 Jan 2019 11:57:37 +0000 Subject: [PATCH] Read m_m_n from cluster states from 6.7 This completes the BWC serialisation changes required for a 6.7 master to inform other nodes of the node-level value of the `minimum_master_nodes` setting. Relates #37701, #37811 --- .../main/java/org/elasticsearch/cluster/ClusterState.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/ClusterState.java b/server/src/main/java/org/elasticsearch/cluster/ClusterState.java index 200f5b59d54..7660ca9da92 100644 --- a/server/src/main/java/org/elasticsearch/cluster/ClusterState.java +++ b/server/src/main/java/org/elasticsearch/cluster/ClusterState.java @@ -804,7 +804,7 @@ public class ClusterState implements ToXContentFragment, Diffable Custom customIndexMetaData = in.readNamedWriteable(Custom.class); builder.putCustom(customIndexMetaData.getWriteableName(), customIndexMetaData); } - builder.minimumMasterNodesOnPublishingMaster = in.getVersion().onOrAfter(Version.V_7_0_0) ? in.readVInt() : -1; + builder.minimumMasterNodesOnPublishingMaster = in.getVersion().onOrAfter(Version.V_6_7_0) ? in.readVInt() : -1; return builder.build(); } @@ -830,7 +830,7 @@ public class ClusterState implements ToXContentFragment, Diffable out.writeNamedWriteable(cursor.value); } } - if (out.getVersion().onOrAfter(Version.V_7_0_0)) { + if (out.getVersion().onOrAfter(Version.V_6_7_0)) { out.writeVInt(minimumMasterNodesOnPublishingMaster); } } @@ -880,7 +880,7 @@ public class ClusterState implements ToXContentFragment, Diffable metaData = MetaData.readDiffFrom(in); blocks = ClusterBlocks.readDiffFrom(in); customs = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), CUSTOM_VALUE_SERIALIZER); - minimumMasterNodesOnPublishingMaster = in.getVersion().onOrAfter(Version.V_7_0_0) ? in.readVInt() : -1; + minimumMasterNodesOnPublishingMaster = in.getVersion().onOrAfter(Version.V_6_7_0) ? in.readVInt() : -1; } @Override @@ -894,7 +894,7 @@ public class ClusterState implements ToXContentFragment, Diffable metaData.writeTo(out); blocks.writeTo(out); customs.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_7_0_0)) { + if (out.getVersion().onOrAfter(Version.V_6_7_0)) { out.writeVInt(minimumMasterNodesOnPublishingMaster); } }