From c9bb686927c01e868d6f4e59a07aee455a5cdfa6 Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Thu, 3 Aug 2017 16:16:30 -0400 Subject: [PATCH] Snapshot/Restore: Update version of shard failure reason serialization Updating the version in SnapshotsInProgress serialization method to reflect that #25941 was backported to 6.0.0-beta1. Relates to #25878 --- .../java/org/elasticsearch/cluster/SnapshotsInProgress.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java b/core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java index 54fec0734e5..2d3886aa52f 100644 --- a/core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java +++ b/core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java @@ -415,7 +415,7 @@ public class SnapshotsInProgress extends AbstractNamedDiffable implement int shards = in.readVInt(); for (int j = 0; j < shards; j++) { ShardId shardId = ShardId.readShardId(in); - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { builder.put(shardId, new ShardSnapshotStatus(in)); } else { String nodeId = in.readOptionalString(); @@ -458,7 +458,7 @@ public class SnapshotsInProgress extends AbstractNamedDiffable implement out.writeVInt(entry.shards().size()); for (ObjectObjectCursor shardEntry : entry.shards()) { shardEntry.key.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { shardEntry.value.writeTo(out); } else { out.writeOptionalString(shardEntry.value.nodeId());