honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update PutFollowAction serialization post-backport (#37989)

Browse Source 
This commit modifies the `PutFollowRequest` to reflect the fact that
active shard functionality has been backported to 6.7.
This commit is contained in:
Tim Brooks 2019-01-31 09:31:22 -07:00 committed by GitHub
parent 9923f0fe6a
commit b8575c6aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,8 +202,7 @@ public final class PutFollowAction extends Action<PutFollowAction.Response> {
super(in); super(in);
remoteCluster = in.readString(); remoteCluster = in.readString();
leaderIndex = in.readString(); leaderIndex = in.readString();
// TODO: Update after backport if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
waitForActiveShards(ActiveShardCount.readFrom(in)); waitForActiveShards(ActiveShardCount.readFrom(in));
} }
followRequest = new ResumeFollowAction.Request(in); followRequest = new ResumeFollowAction.Request(in);
@ -214,8 +213,7 @@ public final class PutFollowAction extends Action<PutFollowAction.Response> {
super.writeTo(out); super.writeTo(out);
out.writeString(remoteCluster); out.writeString(remoteCluster);
out.writeString(leaderIndex); out.writeString(leaderIndex);
// TODO: Update after backport if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
waitForActiveShards.writeTo(out); waitForActiveShards.writeTo(out);
} }
followRequest.writeTo(out); followRequest.writeTo(out);