Correct backport replica rollback to 6.2 (#28181)

dnhatn · dnhatn · commit 9774ba35a181 · 2018-01-13T14:10:23.000-05:00
The previous backport was not corect. Relates #28181
diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java
@@ -82,10 +82,10 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeLong(recoveryId);
         shardId.writeTo(out);
         out.writeVInt(totalTranslogOps);
-        if (out.getVersion().before(Version.V_6_2_0)) {
+        if (out.getVersion().before(Version.V_6_0_0_alpha1)) {
             out.writeLong(IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP); // maxUnsafeAutoIdTimestamp
         }
-        if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (out.getVersion().onOrAfter(Version.V_6_2_0)) {
             out.writeBoolean(createNewTranslog);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,10 @@ public void writeTo(StreamOutput out) throws IOException {`
`82`	`82`	`out.writeLong(recoveryId);`
`83`	`83`	`shardId.writeTo(out);`
`84`	`84`	`out.writeVInt(totalTranslogOps);`
`85`		`- if (out.getVersion().before(Version.V_6_2_0)) {`
	`85`	`+ if (out.getVersion().before(Version.V_6_0_0_alpha1)) {`
`86`	`86`	`out.writeLong(IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP); // maxUnsafeAutoIdTimestamp`
`87`	`87`	`}`
`88`		`- if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {`
	`88`	`+ if (out.getVersion().onOrAfter(Version.V_6_2_0)) {`
`89`	`89`	`out.writeBoolean(createNewTranslog);`
`90`	`90`	`}`
`91`	`91`	`}`