Merge commit '228cbf9776'

(cherry picked from commit b11d853)

Author: michaelklishin

deps/rabbit/docs/rabbitmq.conf.example

@@ -384,6 +384,17 @@
 ## properties that may conflict or significantly change queue behavior and semantics, such as the 'exclusive' field.
 # quorum_queue.property_equivalence.relaxed_checks_on_redeclaration = true
 
+## Sets the initial quorum queue replica count for newly declared quorum queues.
+## This value can be overridden using the 'x-quorum-initial-group-size' queue argument
+## at declaration time.
+# quorum_queue.initial_cluster_size = 3
+
+## Sets the maximum number of unconfirmed messages a channel can send
+## before publisher flow control is triggered.
+## The current default is configured to provide good performance and stability
+## when there are multiple publishers sending to the same quorum queue.
+# quorum_queue.commands_soft_limit = 32
+
 ## Changes classic queue storage implementation version.
 ## In 4.0.x, version 2 is the default and this is a forward compatibility setting,
 ## that is, it will be useful when a new version is developed.

deps/rabbit/priv/schema/rabbit.schema

@@ -2610,6 +2610,15 @@ end}.
 {mapping, "quorum_queue.property_equivalence.relaxed_checks_on_redeclaration", "rabbit.quorum_relaxed_checks_on_redeclaration", [
     {datatype, {enum, [true, false]}}]}.
 
+{mapping, "quorum_queue.initial_cluster_size", "rabbit.quorum_cluster_size", [
+  {datatype, integer},
+  {validators, ["non_zero_positive_integer"]}
+]}.
+
+{mapping, "quorum_queue.commands_soft_limit", "rabbit.quorum_commands_soft_limit", [
+  {datatype, integer},
+  {validators, ["non_zero_positive_integer"]}
+]}.
 
 %%
 %% Quorum Queue membership reconciliation

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

@@ -1067,6 +1067,20 @@ credential_validator.regexp = ^abc\\d+",
      ]}],
    []},
 
+  {quorum_queue_initial_cluster_size,
+   "quorum_queue.initial_cluster_size = 3",
+   [{rabbit, [
+      {quorum_cluster_size, 3}
+     ]}],
+   []},
+
+  {quorum_queue_commands_soft_limit,
+   "quorum_queue.commands_soft_limit = 32",
+   [{rabbit, [
+      {quorum_commands_soft_limit, 32}
+     ]}],
+   []},
+
   %%
   %% Runtime parameters
   %%