From c9749180a1a966091949db155cbb4e1396972525 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Sat, 17 Mar 2018 11:38:22 -0400 Subject: [PATCH] Backport - Do not renew sync-id PR to 5.6 and 6.3 Relates ##29103 --- .../org/elasticsearch/indices/flush/SyncedFlushService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java b/server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java index dedd577954d..65bacd94910 100644 --- a/server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java +++ b/server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java @@ -569,7 +569,11 @@ public class SyncedFlushService extends AbstractComponent implements IndexEventL } boolean includeExistingSyncId(Version version) { - return version.onOrAfter(Version.V_7_0_0_alpha1); + 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); + } } @Override