honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Nhat Nguyen 2018-03-20 13:54:38 -04:00
parent b4af451ec5
commit f938c4267e
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
View File

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