Browse Source

Backported the harden synced-flush PR to v6.3.0

Relates #28464
Nhat Nguyen 7 years ago
parent
commit
875bbfe699

+ 2 - 2
server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java

@@ -533,7 +533,7 @@ public class SyncedFlushService extends AbstractComponent implements IndexEventL
         public void readFrom(StreamInput in) throws IOException {
         public void readFrom(StreamInput in) throws IOException {
             super.readFrom(in);
             super.readFrom(in);
             commitId = new Engine.CommitId(in);
             commitId = new Engine.CommitId(in);
-            if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+            if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
                 numDocs = in.readInt();
                 numDocs = in.readInt();
             } else {
             } else {
                 numDocs = UNKNOWN_NUM_DOCS;
                 numDocs = UNKNOWN_NUM_DOCS;
@@ -544,7 +544,7 @@ public class SyncedFlushService extends AbstractComponent implements IndexEventL
         public void writeTo(StreamOutput out) throws IOException {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             super.writeTo(out);
             commitId.writeTo(out);
             commitId.writeTo(out);
-            if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+            if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
                 out.writeInt(numDocs);
                 out.writeInt(numDocs);
             }
             }
         }
         }