Merge branch 'release/os/5.2' into yift/core-18720/introduce-session-…

…state # Conflicts: # gradle.properties
corda · Dec 15, 2023 · 66b18c8 · 66b18c8
2 parents 06c184b + ea7dd88
commit 66b18c8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/data/config-schema/src/main/java/net/corda/schema/configuration/FlowConfig.java b/data/config-schema/src/main/java/net/corda/schema/configuration/FlowConfig.java
@@ -14,5 +14,4 @@ private FlowConfig() {
     public static final String PROCESSING_MAX_RETRY_DELAY = "processing.maxRetryDelay";
     public static final String PROCESSING_MAX_FLOW_SLEEP_DURATION = "processing.maxFlowSleepDuration";
     public static final String PROCESSING_FLOW_CLEANUP_TIME = "processing.cleanupTime";
-    public static final String PROCESSING_THREAD_POOL_SIZE = "processing.poolSize";
 }
diff --git a/data/config-schema/src/main/java/net/corda/schema/configuration/MessagingConfig.java b/data/config-schema/src/main/java/net/corda/schema/configuration/MessagingConfig.java
@@ -57,6 +57,8 @@ private Subscription() {
         public static final String SUBSCRIBE_RETRIES = SUBSCRIPTION + ".subscribeRetries";
         public static final String COMMIT_RETRIES = SUBSCRIPTION + ".commitRetries";
         public static final String PROCESSOR_TIMEOUT = SUBSCRIPTION + ".processorTimeout";
+        public static final String PROCESSING_THREAD_POOL_SIZE = SUBSCRIPTION + ".mediator.poolSize";
+        public static final String PROCESSING_MIN_POOL_RECORD_COUNT = SUBSCRIPTION + ".mediator.minPoolRecordCount";
     }
 
     /**

diff --git a/...-schema/src/main/resources/net/corda/schema/configuration/messaging/1.0/subscription.json b/...-schema/src/main/resources/net/corda/schema/configuration/messaging/1.0/subscription.json
@@ -46,6 +46,27 @@
       "minimum": 1000,
       "maximum": 2147483647,
       "default": 15000
+    },
+    "mediator": {
+      "description": "Settings for the multi source mediator",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "poolSize": {
+          "description": "The size of the mediator event processing pool size.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 2147483647,
+          "default": 8
+        },
+        "minPoolRecordCount": {
+          "description": "The minimum number of events in a single mediator processing pool. If the number of records polled is less than this, then the polled records are used in a single pool.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 2147483647,
+          "default": 20
+        }
+      }
     }
   },
   "additionalProperties": false