Adjust bwc for stale primary recovery source (#33432)

dnhatn · dnhatn · commit e6ca55bca694 · 2018-09-09T21:34:32.000-04:00
Relates #33432
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java b/server/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java
@@ -142,7 +142,7 @@ private ExistingStoreRecoverySource(boolean bootstrapNewHistoryUUID) {
         }
 
         private ExistingStoreRecoverySource(StreamInput in) throws IOException {
-            if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+            if (in.getVersion().onOrAfter(Version.V_6_5_0)) {
                 bootstrapNewHistoryUUID = in.readBoolean();
             } else {
                 bootstrapNewHistoryUUID = false;
@@ -156,7 +156,7 @@ public void addAdditionalFields(XContentBuilder builder, Params params) throws I
 
         @Override
         protected void writeAdditionalFields(StreamOutput out) throws IOException {
-            if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+            if (out.getVersion().onOrAfter(Version.V_6_5_0)) {
                 out.writeBoolean(bootstrapNewHistoryUUID);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ private ExistingStoreRecoverySource(boolean bootstrapNewHistoryUUID) {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private ExistingStoreRecoverySource(StreamInput in) throws IOException {`
`145`		`- if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {`
	`145`	`+ if (in.getVersion().onOrAfter(Version.V_6_5_0)) {`
`146`	`146`	`bootstrapNewHistoryUUID = in.readBoolean();`
`147`	`147`	`} else {`
`148`	`148`	`bootstrapNewHistoryUUID = false;`
`@@ -156,7 +156,7 @@ public void addAdditionalFields(XContentBuilder builder, Params params) throws I`
`156`	`156`
`157`	`157`	`@Override`
`158`	`158`	`protected void writeAdditionalFields(StreamOutput out) throws IOException {`
`159`		`- if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {`
	`159`	`+ if (out.getVersion().onOrAfter(Version.V_6_5_0)) {`
`160`	`160`	`out.writeBoolean(bootstrapNewHistoryUUID);`
`161`	`161`	`}`
`162`	`162`	`}`