Skip to content

Commit b8575c6

Browse files
authored
Update PutFollowAction serialization post-backport (#37989)
This commit modifies the `PutFollowRequest` to reflect the fact that active shard functionality has been backported to 6.7.
1 parent 9923f0f commit b8575c6

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/action/PutFollowAction.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,7 @@ public Request(StreamInput in) throws IOException {
202202
super(in);
203203
remoteCluster = in.readString();
204204
leaderIndex = in.readString();
205-
// TODO: Update after backport
206-
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
205+
if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
207206
waitForActiveShards(ActiveShardCount.readFrom(in));
208207
}
209208
followRequest = new ResumeFollowAction.Request(in);
@@ -214,8 +213,7 @@ public void writeTo(StreamOutput out) throws IOException {
214213
super.writeTo(out);
215214
out.writeString(remoteCluster);
216215
out.writeString(leaderIndex);
217-
// TODO: Update after backport
218-
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
216+
if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
219217
waitForActiveShards.writeTo(out);
220218
}
221219
followRequest.writeTo(out);

0 commit comments

Comments
 (0)