[CCR] Fix request serialization bug (#34917)

and some parameters that were not set in tests.

Author: martijnvg

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java

@@ -137,9 +137,6 @@ public void testAutoFollowParameterAreDelegated() throws Exception {
         if (randomBoolean()) {
             request.setMaxReadRequestOperationCount(randomIntBetween(0, Integer.MAX_VALUE));
         }
-        if (randomBoolean()) {
-            request.setMaxWriteBufferSize(new ByteSizeValue(randomNonNegativeLong()));
-        }
         if (randomBoolean()) {
             request.setMaxReadRequestSize(new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES));
         }
@@ -155,6 +152,9 @@ public void testAutoFollowParameterAreDelegated() throws Exception {
         if (randomBoolean()) {
             request.setMaxWriteBufferSize(new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES));
         }
+        if (randomBoolean()) {
+            request.setMaxWriteRequestSize(new ByteSizeValue(randomNonNegativeLong()));
+        }
         assertTrue(followerClient().execute(PutAutoFollowPatternAction.INSTANCE, request).actionGet().isAcknowledged());
 
         createLeaderIndex("logs-201901", leaderIndexSettings);

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/PutAutoFollowPatternRequestTests.java

@@ -53,6 +53,15 @@ protected PutAutoFollowPatternAction.Request createTestInstance() {
         if (randomBoolean()) {
             request.setMaxRetryDelay(TimeValue.timeValueMillis(500));
         }
+        if (randomBoolean()) {
+            request.setMaxWriteRequestOperationCount(randomIntBetween(0, Integer.MAX_VALUE));
+        }
+        if (randomBoolean()) {
+            request.setMaxWriteBufferSize(new ByteSizeValue(randomNonNegativeLong()));
+        }
+        if (randomBoolean()) {
+            request.setMaxWriteRequestSize(new ByteSizeValue(randomNonNegativeLong()));
+        }
         if (randomBoolean()) {
             request.setMaxReadRequestOperationCount(randomIntBetween(0, Integer.MAX_VALUE));
         }

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ResumeFollowActionRequestTests.java

@@ -59,6 +59,12 @@ static ResumeFollowAction.Request createTestRequest() {
         if (randomBoolean()) {
             request.setMaxWriteBufferCount(randomIntBetween(1, Integer.MAX_VALUE));
         }
+        if (randomBoolean()) {
+            request.setMaxWriteRequestOperationCount(randomIntBetween(1, Integer.MAX_VALUE));
+        }
+        if (randomBoolean()) {
+            request.setMaxWriteRequestSize(new ByteSizeValue(randomNonNegativeLong()));
+        }
         if (randomBoolean()) {
             request.setMaxWriteBufferSize(new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES));
         }

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

@@ -271,6 +271,8 @@ public void readFrom(final StreamInput in) throws IOException {
             maxReadRequestOperationCount = in.readOptionalVInt();
             maxOutstandingReadRequests = in.readOptionalVInt();
             maxReadRequestSize = in.readOptionalWriteable(ByteSizeValue::new);
+            maxWriteRequestOperationCount = in.readOptionalVInt();
+            maxWriteRequestSize = in.readOptionalWriteable(ByteSizeValue::new);
             maxOutstandingWriteRequests = in.readOptionalVInt();
             maxWriteBufferCount = in.readOptionalVInt();
             maxWriteBufferSize = in.readOptionalWriteable(ByteSizeValue::new);
@@ -285,6 +287,8 @@ public void writeTo(final StreamOutput out) throws IOException {
             out.writeOptionalVInt(maxReadRequestOperationCount);
             out.writeOptionalVInt(maxOutstandingReadRequests);
             out.writeOptionalWriteable(maxReadRequestSize);
+            out.writeOptionalVInt(maxWriteRequestOperationCount);
+            out.writeOptionalWriteable(maxWriteRequestSize);
             out.writeOptionalVInt(maxOutstandingWriteRequests);
             out.writeOptionalVInt(maxWriteBufferCount);
             out.writeOptionalWriteable(maxWriteBufferSize);