瀏覽代碼

Fix BWC issue for PreSyncedFlushResponse

I misunderstood how the bwc versions works. If we backport to 5.x, we
need to backport to all supported 6.*.  This commit corrects the BWC
versions for PreSyncedFlushResponse.

Relates #29103
Nhat Nguyen 7 年之前
父節點
當前提交
f938c4267e
共有 1 個文件被更改,包括 2 次插入10 次删除
  1. 2 10
      server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java

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

@@ -561,19 +561,11 @@ public class SyncedFlushService extends AbstractComponent implements IndexEventL
         }
 
         boolean includeNumDocs(Version version) {
-            if (version.major == Version.V_5_6_8.major) {
-                return version.onOrAfter(Version.V_5_6_8);
-            } else {
-                return version.onOrAfter(Version.V_6_2_2);
-            }
+            return version.onOrAfter(Version.V_5_6_8);
         }
 
         boolean includeExistingSyncId(Version version) {
-            if (version.major == Version.V_5_6_9.major) {
-                return version.onOrAfter(Version.V_5_6_9);
-            } else {
-                return version.onOrAfter(Version.V_6_3_0);
-            }
+            return version.onOrAfter(Version.V_5_6_9);
         }
 
         @Override