From 1463c5509b8063870f0960528584560e7117f654 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <kjnilsson@gmail.com>
Date: Tue, 10 Sep 2024 14:36:07 +0100
Subject: [PATCH 1/2] QQ: add details on how to disable default delivery limit

---
 docs/quorum-queues/index.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/quorum-queues/index.md b/docs/quorum-queues/index.md
index df30b10c9..159a24041 100644
--- a/docs/quorum-queues/index.md
+++ b/docs/quorum-queues/index.md
@@ -359,10 +359,14 @@ dropped messages are retained for some time after.
 :::important
 
 Starting with RabbitMQ 4.0, the delivery limit for quorum queues defaults to 20.
-There is no way to set it to the old, unlimited default.
+The old unlimited default can be restored by setting a queue argument or policy
+with `delivery-limit=-1`
+
 
 :::
 
+See [repeated requeues](#repeated-requeues) for more details.
+
 ### Configuring the Limit {#position-message-handling-configuring-limit}
 
 It is possible to set a delivery limit for a queue using a [policy](./parameters#policies) argument, `delivery-limit`.
@@ -1110,17 +1114,17 @@ truncated regularly. To be able to truncate a section of the log all messages
 in that section needs to be acknowledged. Usage patterns that continuously
 [reject or nack](./nack) the same message with the `requeue` flag set to true
 could cause the log to grow in an unbounded fashion and eventually fill
-up the disks. Therefore since RabbitMQ 4.0 a default `delivery-limit` of 20 is always set 
-after which the message will be dropped or dead lettered.
+up the disks. Therefore since RabbitMQ 4.0 a default `delivery-limit` of 20 is
+always set after which the message will be dropped or dead lettered.
 
 Messages that are rejected or nacked back to a quorum queue will be
 returned to the _back_ of the queue _if_ no [delivery-limit](#poison-message-handling) is set.
-This avoids
-the above scenario where repeated re-queues causes the Raft log to grow in an
-unbounded manner. If a `delivery-limit` is set it will use the original behaviour
+This avoids the above scenario where repeated re-queues causes the Raft log to grow in an unbounded manner. If a `delivery-limit` is set it will use the original behaviour
 of returning the message near the head of the queue.
-(NB: since 4.0 a delivery-limit will only be unset _if_ a queue was upgraded
-from a prior version, newly declared queues will always have a default of 20).
+
+The old unlimited delivery-limit behaviour can be restored by setting a queue
+argument or policy with a delivery limit of -1. It is not recommended to do
+so but may be needed for 3.13.x compatibility in some rare cases.
 
 ### Increased Atom Use {#atom-use}
 

From 4a2c82b6832468b6b86e9ecfe3b0b36caf75716f Mon Sep 17 00:00:00 2001
From: Michael Klishin <klishinm@vmware.com>
Date: Tue, 10 Sep 2024 11:55:37 -0400
Subject: [PATCH 2/2] Edits #2057

---
 docs/queues.md                        |  9 +++-
 docs/quorum-queues/index.md           | 63 ++++++++++++++++++++++++++-
 versioned_docs/version-3.13/queues.md |  9 +++-
 3 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/docs/queues.md b/docs/queues.md
index 7b339c4fe..bc8402ad0 100644
--- a/docs/queues.md
+++ b/docs/queues.md
@@ -145,11 +145,16 @@ The map is used by various features and plugins such as
  * Queue type (e.g. [quorum](./quorum-queues) or [classic](./classic-queues))
  * [Message and queue TTL](./ttl)
  * [Queue length limit](./maxlength)
- * Max number of [priorities](./priority)
- * [Consumer priorities](./consumer-priority)
+ * Quorum queue [redelivery limit](./quorum-queues#poison-message-handling)
+ * Max number of [priorities](./priority) of a classic queue
 
 and so on.
 
+The same idea is also used with other protocol operations, for example, when
+registering a consumer:
+
+ * [Consumer priorities](./consumer-priority)
+
 Most optional arguments can be dynamically changed after queue declaration but there are
 exceptions. For example, [queue type](./quorum-queues) (`x-queue-type`) and max number
 of [queue priorities](./priority) (`x-max-priority`) must be set at queue declaration time
diff --git a/docs/quorum-queues/index.md b/docs/quorum-queues/index.md
index 159a24041..3821331aa 100644
--- a/docs/quorum-queues/index.md
+++ b/docs/quorum-queues/index.md
@@ -359,8 +359,9 @@ dropped messages are retained for some time after.
 :::important
 
 Starting with RabbitMQ 4.0, the delivery limit for quorum queues defaults to 20.
-The old unlimited default can be restored by setting a queue argument or policy
-with `delivery-limit=-1`
+
+The 3.13.x era behavior where there was no lilmit can be restored by setting the limit to `-1`
+using an [optional queue argument](./queues#optional-arguments) at declaration time or using a policy as demonstrated below.
 
 
 :::
@@ -371,6 +372,8 @@ See [repeated requeues](#repeated-requeues) for more details.
 
 It is possible to set a delivery limit for a queue using a [policy](./parameters#policies) argument, `delivery-limit`.
 
+#### Overriding the Limit
+
 The following example sets the limit to 50 for queues whose names begin with
 `qq`.
 
@@ -425,6 +428,62 @@ PUT /api/policies/%2f/qq-overrides
 </TabItem>
 </Tabs>
 
+#### Disaling the Limit
+
+The following example disables the limit for queues whose names begin with
+`qq.unlimited`.
+
+<Tabs groupId="shell-specific">
+<TabItem value="bash" label="bash" default>
+```bash
+rabbitmqctl set_policy qq-overrides \
+    "^qq\.unlimited" '{"delivery-limit": -1}' \
+    --priority 20 \
+    --apply-to "quorum_queues"
+```
+</TabItem>
+
+<TabItem value="PowerShell" label="PowerShell">
+```PowerShell
+rabbitmqctl.bat set_policy qq-overrides ^
+    "^qq\.unlimited" "{""delivery-limit"": -1}" ^
+    --priority 20 ^
+    --apply-to "quorum_queues"
+```
+</TabItem>
+
+<TabItem value="HTTP API" label="HTTP API">
+```ini
+PUT /api/policies/%2f/qq-overrides
+    {"pattern": "^qq\.unlimited",
+     "definition": {"delivery-limit": -1},
+     "priority": 1,
+    "apply-to": "quorum_queues"}
+```
+</TabItem>
+
+<TabItem value="Management UI" label="Management UI">
+<ol>
+  <li>
+    Navigate to `Admin` > `Policies` > `Add / update a
+    policy`.
+  </li>
+  <li>
+    Enter a policy name (such as "qq-overrides") next to Name, a pattern (such as "^qq\.unlimited") next to
+    Pattern, and select what kind of entities (quorum queues in this example) the policy should apply to using the `Apply to`
+    drop down.
+  </li>
+  <li>
+    Enter "delivery-limit" for policy argument and -1 for its value in the first line next to
+    `Policy`.
+  </li>
+  <li>
+    Click `Add policy`.
+  </li>
+</ol>
+</TabItem>
+</Tabs>
+
 ### Configuring the Limit and Setting Up Dead-Lettering {#position-message-handling-configuring-dlx}
 
 Messages that are redelivered more times than the limit allows for will be either dropped (removed) or [dead-lettered](./dlx).
diff --git a/versioned_docs/version-3.13/queues.md b/versioned_docs/version-3.13/queues.md
index f6b3fb66a..4f1bf647c 100644
--- a/versioned_docs/version-3.13/queues.md
+++ b/versioned_docs/version-3.13/queues.md
@@ -144,11 +144,16 @@ The map is used by various features and plugins such as
  * Queue type (e.g. [quorum](./quorum-queues) or [classic](./classic-queues))
  * [Message and queue TTL](./ttl)
  * [Queue length limit](./maxlength)
- * Max number of [priorities](./priority)
- * [Consumer priorities](./consumer-priority)
+ * Quorum queue [redelivery limit](./quorum-queues#poison-message-handling)
+ * Max number of [priorities](./priority) of a classic queue
 
 and so on.
 
+The same idea is also used with other protocol operations, for example, when
+registering a consumer:
+
+ * [Consumer priorities](./consumer-priority)
+
 Most optional arguments can be dynamically changed after queue declaration but there are
 exceptions. For example, [queue type](./quorum-queues) (`x-queue-type`) and max number
 of [queue priorities](./priority) (`x-max-priority`) must be set at queue declaration time