From 11ecded562f452ee5a39923f4144d7141ada968f Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <corneil.duplessis@gmail.com>
Date: Tue, 28 Jun 2022 10:14:09 +0200
Subject: [PATCH] Checks RABBITMQ_ULIMIT_NOFILES and only change ulimit if it
 is set to a value larger than existing. (#208)

fixes #86

Signed-off-by: Corneil du Plessis <pcorneil@vmware.com>
---
 .../rootfs/opt/bitnami/scripts/rabbitmq/run.sh        | 11 ++++++++++-
 .../rootfs/opt/bitnami/scripts/rabbitmq/run.sh        | 11 ++++++++++-
 .../rootfs/opt/bitnami/scripts/rabbitmq/run.sh        | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
index 1c3330e29c96..8976d2d5454a 100755
--- a/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
+++ b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
@@ -38,7 +38,16 @@ if is_boolean_yes "$RABBITMQ_CLUSTER_REBALANCE"; then
 fi
 
 # Resources limits: maximum number of open file descriptors
-[[ -n "${RABBITMQ_ULIMIT_NOFILES:-}" ]] && info "Setting file discripton limit to ${RABBITMQ_ULIMIT_NOFILES}" && ulimit -n "${RABBITMQ_ULIMIT_NOFILES}"
+if [[ -n "${RABBITMQ_ULIMIT_NOFILES:-}" ]]; then
+    current_limit=$(ulimit -n)
+    if [ "$current_limit" != "unlimited" ]; then
+        # shellcheck disable=SC2086
+        if [ $RABBITMQ_ULIMIT_NOFILES -gt $current_limit ]; then
+            info "Setting file description limit to $RABBITMQ_ULIMIT_NOFILES"
+            ulimit -n $RABBITMQ_ULIMIT_NOFILES
+        fi
+    fi
+fi
 
 info "** Starting RabbitMQ **"
 cd "$RABBITMQ_BASE_DIR"
diff --git a/bitnami/rabbitmq/3.8/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh b/bitnami/rabbitmq/3.8/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
index 1c3330e29c96..8976d2d5454a 100755
--- a/bitnami/rabbitmq/3.8/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
+++ b/bitnami/rabbitmq/3.8/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
@@ -38,7 +38,16 @@ if is_boolean_yes "$RABBITMQ_CLUSTER_REBALANCE"; then
 fi
 
 # Resources limits: maximum number of open file descriptors
-[[ -n "${RABBITMQ_ULIMIT_NOFILES:-}" ]] && info "Setting file discripton limit to ${RABBITMQ_ULIMIT_NOFILES}" && ulimit -n "${RABBITMQ_ULIMIT_NOFILES}"
+if [[ -n "${RABBITMQ_ULIMIT_NOFILES:-}" ]]; then
+    current_limit=$(ulimit -n)
+    if [ "$current_limit" != "unlimited" ]; then
+        # shellcheck disable=SC2086
+        if [ $RABBITMQ_ULIMIT_NOFILES -gt $current_limit ]; then
+            info "Setting file description limit to $RABBITMQ_ULIMIT_NOFILES"
+            ulimit -n $RABBITMQ_ULIMIT_NOFILES
+        fi
+    fi
+fi
 
 info "** Starting RabbitMQ **"
 cd "$RABBITMQ_BASE_DIR"
diff --git a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
index 1c3330e29c96..8976d2d5454a 100755
--- a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
+++ b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
@@ -38,7 +38,16 @@ if is_boolean_yes "$RABBITMQ_CLUSTER_REBALANCE"; then
 fi
 
 # Resources limits: maximum number of open file descriptors
-[[ -n "${RABBITMQ_ULIMIT_NOFILES:-}" ]] && info "Setting file discripton limit to ${RABBITMQ_ULIMIT_NOFILES}" && ulimit -n "${RABBITMQ_ULIMIT_NOFILES}"
+if [[ -n "${RABBITMQ_ULIMIT_NOFILES:-}" ]]; then
+    current_limit=$(ulimit -n)
+    if [ "$current_limit" != "unlimited" ]; then
+        # shellcheck disable=SC2086
+        if [ $RABBITMQ_ULIMIT_NOFILES -gt $current_limit ]; then
+            info "Setting file description limit to $RABBITMQ_ULIMIT_NOFILES"
+            ulimit -n $RABBITMQ_ULIMIT_NOFILES
+        fi
+    fi
+fi
 
 info "** Starting RabbitMQ **"
 cd "$RABBITMQ_BASE_DIR"