Skip to content

Change ShardFollowTask to reuse common serialization logic #39094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2019
+40 −26
Merged

Change ShardFollowTask to reuse common serialization logic #39094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 40 additions & 26 deletions x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,32 @@ public static ShardFollowTask readFrom(StreamInput in) throws IOException {
String remoteCluster = in.readString();
ShardId followShardId = ShardId.readShardId(in);
ShardId leaderShardId = ShardId.readShardId(in);
// TODO: use ImmutableFollowParameters(StreamInput) constructor
int maxReadRequestOperationCount = in.readVInt();
ByteSizeValue maxReadRequestSize = new ByteSizeValue(in);
int maxOutstandingReadRequests = in.readVInt();
int maxWriteRequestOperationCount = in.readVInt();
ByteSizeValue maxWriteRequestSize = new ByteSizeValue(in);
int maxOutstandingWriteRequests = in.readVInt();
int maxWriteBufferCount = in.readVInt();
ByteSizeValue maxWriteBufferSize = new ByteSizeValue(in);
TimeValue maxRetryDelay = in.readTimeValue();
TimeValue readPollTimeout = in.readTimeValue();
Map<String, String> headers = Collections.unmodifiableMap(in.readMap(StreamInput::readString, StreamInput::readString));
return new ShardFollowTask(remoteCluster, followShardId, leaderShardId, maxReadRequestOperationCount,
maxWriteRequestOperationCount, maxOutstandingReadRequests, maxOutstandingWriteRequests, maxReadRequestSize,
maxWriteRequestSize, maxWriteBufferCount, maxWriteBufferSize, maxRetryDelay, readPollTimeout, headers);
if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
return new ShardFollowTask(remoteCluster, followShardId, leaderShardId, in);
} else {
int maxReadRequestOperationCount = in.readVInt();
ByteSizeValue maxReadRequestSize = new ByteSizeValue(in);
int maxOutstandingReadRequests = in.readVInt();
int maxWriteRequestOperationCount = in.readVInt();
ByteSizeValue maxWriteRequestSize = new ByteSizeValue(in);
int maxOutstandingWriteRequests = in.readVInt();
int maxWriteBufferCount = in.readVInt();
ByteSizeValue maxWriteBufferSize = new ByteSizeValue(in);
TimeValue maxRetryDelay = in.readTimeValue();
TimeValue readPollTimeout = in.readTimeValue();
Map<String, String> headers = Collections.unmodifiableMap(in.readMap(StreamInput::readString, StreamInput::readString));
return new ShardFollowTask(remoteCluster, followShardId, leaderShardId, maxReadRequestOperationCount,
maxWriteRequestOperationCount, maxOutstandingReadRequests, maxOutstandingWriteRequests, maxReadRequestSize,
maxWriteRequestSize, maxWriteBufferCount, maxWriteBufferSize, maxRetryDelay, readPollTimeout, headers);
}
}

private ShardFollowTask(String remoteCluster, ShardId followShardId, ShardId leaderShardId, StreamInput in) throws IOException {
super(in);
this.remoteCluster = remoteCluster;
this.followShardId = followShardId;
this.leaderShardId = leaderShardId;
this.headers = Collections.unmodifiableMap(in.readMap(StreamInput::readString, StreamInput::readString));
}

public String getRemoteCluster() {
Expand Down Expand Up @@ -139,17 +150,20 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeString(remoteCluster);
followShardId.writeTo(out);
leaderShardId.writeTo(out);
// TODO: use super.writeTo()
out.writeVLong(getMaxReadRequestOperationCount());
getMaxReadRequestSize().writeTo(out);
out.writeVInt(getMaxOutstandingReadRequests());
out.writeVLong(getMaxWriteRequestOperationCount());
getMaxWriteRequestSize().writeTo(out);
out.writeVInt(getMaxOutstandingWriteRequests());
out.writeVInt(getMaxWriteBufferCount());
getMaxWriteBufferSize().writeTo(out);
out.writeTimeValue(getMaxRetryDelay());
out.writeTimeValue(getReadPollTimeout());
if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
super.writeTo(out);
} else {
out.writeVLong(getMaxReadRequestOperationCount());
getMaxReadRequestSize().writeTo(out);
out.writeVInt(getMaxOutstandingReadRequests());
out.writeVLong(getMaxWriteRequestOperationCount());
getMaxWriteRequestSize().writeTo(out);
out.writeVInt(getMaxOutstandingWriteRequests());
out.writeVInt(getMaxWriteBufferCount());
getMaxWriteBufferSize().writeTo(out);
out.writeTimeValue(getMaxRetryDelay());
out.writeTimeValue(getReadPollTimeout());
}
out.writeMap(headers, StreamOutput::writeString, StreamOutput::writeString);
}

Expand Down