Introduced class reuses follow parameter code between ShardFollowTasks (#38910)

and AutoFollowPattern classes.

The ImmutableFollowParameters is like the already existing FollowParameters,
but all of its fields are final.

Author: martijnvg

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java

@@ -254,7 +254,7 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
         return Arrays.asList(
                 // Persistent action requests
                 new NamedWriteableRegistry.Entry(PersistentTaskParams.class, ShardFollowTask.NAME,
-                        ShardFollowTask::new),
+                        ShardFollowTask::readFrom),
 
                 // Task statuses
                 new NamedWriteableRegistry.Entry(Task.Status.class, ShardFollowNodeTaskStatus.STATUS_PARSER_NAME,

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

@@ -526,7 +526,7 @@ private void followLeaderIndex(String autoFollowPattenName,
             request.getParameters().setMaxWriteBufferCount(pattern.getMaxWriteBufferCount());
             request.getParameters().setMaxWriteBufferSize(pattern.getMaxWriteBufferSize());
             request.getParameters().setMaxRetryDelay(pattern.getMaxRetryDelay());
-            request.getParameters().setReadPollTimeout(pattern.getPollTimeout());
+            request.getParameters().setReadPollTimeout(pattern.getReadPollTimeout());
 
             // Execute if the create and follow api call succeeds:
             Runnable successHandler = () -> {

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

@@ -159,11 +159,11 @@ static ClusterState innerPut(PutAutoFollowPatternAction.Request request,
             request.getLeaderIndexPatterns(),
             request.getFollowIndexNamePattern(),
             request.getParameters().getMaxReadRequestOperationCount(),
-            request.getParameters().getMaxReadRequestSize(),
-            request.getParameters().getMaxOutstandingReadRequests(),
             request.getParameters().getMaxWriteRequestOperationCount(),
-            request.getParameters().getMaxWriteRequestSize(),
+            request.getParameters().getMaxOutstandingReadRequests(),
             request.getParameters().getMaxOutstandingWriteRequests(),
+            request.getParameters().getMaxReadRequestSize(),
+            request.getParameters().getMaxWriteRequestSize(),
             request.getParameters().getMaxWriteBufferCount(),
             request.getParameters().getMaxWriteBufferSize(),
             request.getParameters().getMaxRetryDelay(),

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

@@ -324,11 +324,11 @@ private static ShardFollowTask createShardFollowTask(
             new ShardId(followIndexMetadata.getIndex(), shardId),
             new ShardId(leaderIndexMetadata.getIndex(), shardId),
             maxReadRequestOperationCount,
-            maxReadRequestSize,
-            maxOutstandingReadRequests,
             maxWriteRequestOperationCount,
-            maxWriteRequestSize,
+            maxOutstandingReadRequests,
             maxOutstandingWriteRequests,
+            maxReadRequestSize,
+            maxWriteRequestSize,
             maxWriteBufferCount,
             maxWriteBufferSize,
             maxRetryDelay,

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

@@ -45,11 +45,11 @@ protected AutoFollowMetadata createTestInstance() {
                 leaderPatterns,
                 randomAlphaOfLength(4),
                 randomIntBetween(0, Integer.MAX_VALUE),
-                new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES),
                 randomIntBetween(0, Integer.MAX_VALUE),
                 randomIntBetween(0, Integer.MAX_VALUE),
-                new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES),
                 randomIntBetween(0, Integer.MAX_VALUE),
+                new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES),
+                new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES),
                 randomIntBetween(0, Integer.MAX_VALUE),
                 new ByteSizeValue(randomNonNegativeLong()),
                 TimeValue.timeValueMillis(500),

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

@@ -34,11 +34,11 @@ protected GetAutoFollowPatternAction.Response createTestInstance() {
                 Collections.singletonList(randomAlphaOfLength(4)),
                 randomAlphaOfLength(4),
                 randomIntBetween(0, Integer.MAX_VALUE),
-                new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES),
                 randomIntBetween(0, Integer.MAX_VALUE),
                 randomIntBetween(0, Integer.MAX_VALUE),
-                new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES),
                 randomIntBetween(0, Integer.MAX_VALUE),
+                new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES),
+                new ByteSizeValue(randomNonNegativeLong(), ByteSizeUnit.BYTES),
                 randomIntBetween(0, Integer.MAX_VALUE),
                 new ByteSizeValue(randomNonNegativeLong()),
                 TimeValue.timeValueMillis(500),

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

@@ -82,11 +82,11 @@ private ShardFollowNodeTask createShardFollowTask(int concurrency, TestRun testR
             new ShardId("follow_index", "", 0),
             new ShardId("leader_index", "", 0),
             testRun.maxOperationCount,
-            TransportResumeFollowAction.DEFAULT_MAX_READ_REQUEST_SIZE,
-            concurrency,
             testRun.maxOperationCount,
-            TransportResumeFollowAction.DEFAULT_MAX_READ_REQUEST_SIZE,
             concurrency,
+            concurrency,
+            TransportResumeFollowAction.DEFAULT_MAX_READ_REQUEST_SIZE,
+            TransportResumeFollowAction.DEFAULT_MAX_READ_REQUEST_SIZE,
             10240,
             new ByteSizeValue(512, ByteSizeUnit.MB),
             TimeValue.timeValueMillis(10),

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

@@ -960,11 +960,11 @@ private ShardFollowNodeTask createShardFollowTask(ShardFollowTaskParams params)
             params.followShardId,
             params.leaderShardId,
             params.maxReadRequestOperationCount,
-            params.maxReadRequestSize,
-            params.maxOutstandingReadRequests,
             params.maxWriteRequestOperationCount,
-            params.maxWriteRequestSize,
+            params.maxOutstandingReadRequests,
             params.maxOutstandingWriteRequests,
+            params.maxReadRequestSize,
+            params.maxWriteRequestSize,
             params.maxWriteBufferCount,
             params.maxWriteBufferSize,
             params.maxRetryDelay,

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

@@ -367,11 +367,11 @@ private ShardFollowNodeTask createShardFollowTask(ReplicationGroup leaderGroup,
             new ShardId("follow_index", "", 0),
             new ShardId("leader_index", "", 0),
             between(1, 64),
-            new ByteSizeValue(Long.MAX_VALUE, ByteSizeUnit.BYTES),
-            between(1, 8),
             between(1, 64),
-            new ByteSizeValue(Long.MAX_VALUE, ByteSizeUnit.BYTES),
+            between(1, 8),
             between(1, 4),
+            new ByteSizeValue(Long.MAX_VALUE, ByteSizeUnit.BYTES),
+            new ByteSizeValue(Long.MAX_VALUE, ByteSizeUnit.BYTES),
             10240,
             new ByteSizeValue(512, ByteSizeUnit.MB),
             TimeValue.timeValueMillis(10),