Naming, docs #13747

deps/rabbit/docs/rabbitmq.conf.example

@@ -384,9 +384,10 @@
 ## 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 cluster size for newly declared quorum queues.
-## This value will be overridden if the 'x-quorum-initial-group-size' queue argument is provided.
-# quorum_queue.cluster_size = 3
+## 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.

deps/rabbit/priv/schema/rabbit.schema

@@ -2610,7 +2610,7 @@ end}.
 {mapping, "quorum_queue.property_equivalence.relaxed_checks_on_redeclaration", "rabbit.quorum_relaxed_checks_on_redeclaration", [
     {datatype, {enum, [true, false]}}]}.
 
-{mapping, "quorum_queue.cluster_size", "rabbit.quorum_cluster_size", [
+{mapping, "quorum_queue.initial_cluster_size", "rabbit.quorum_cluster_size", [
   {datatype, integer},
   {validators, ["non_zero_positive_integer"]}
 ]}.

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

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