From c7d4b0bce9e562bd1813a8d8f569450a29dd6dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Tue, 29 Oct 2024 11:37:50 +0100 Subject: [PATCH 1/2] rabbitmq-run.mk: Use a 60 seconds timeout for `rabbitmqctl wait` ... not 60 milliseconds. (cherry picked from commit 624d9bae0c2cfd64f33d2bba16965c4aed58cf5a) (cherry picked from commit d2e87ba3a7cee6c7e9587f781bcb9fb81b2a2146) --- deps/rabbit_common/mk/rabbitmq-run.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbit_common/mk/rabbitmq-run.mk b/deps/rabbit_common/mk/rabbitmq-run.mk index 659fc78246e0..3271e03d1098 100644 --- a/deps/rabbit_common/mk/rabbitmq-run.mk +++ b/deps/rabbit_common/mk/rabbitmq-run.mk @@ -318,7 +318,7 @@ REDIRECT_STDIO = > $(RABBITMQ_LOG_BASE)/startup_log \ 2> $(RABBITMQ_LOG_BASE)/startup_err endif -RMQCTL_WAIT_TIMEOUT ?= 60 +RMQCTL_WAIT_TIMEOUT ?= 60000 start-background-node: node-tmpdir $(DIST_TARGET) $(BASIC_SCRIPT_ENV_SETTINGS) \ From 5313f1b57acf13d35f48562aeb0ee61cd6ffb6d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Tue, 29 Oct 2024 11:41:20 +0100 Subject: [PATCH 2/2] rabbitmq-run.mk: Restart nodes in a cluster sequentially ... not in parallel. (cherry picked from commit c0be3c064857bb292c0620d2a8652f6ec3b8ff1c) (cherry picked from commit 168c703bbcfbcbb54dd50f0e3897716e7988f632) --- deps/rabbit_common/mk/rabbitmq-run.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbit_common/mk/rabbitmq-run.mk b/deps/rabbit_common/mk/rabbitmq-run.mk index 3271e03d1098..083d624cc29e 100644 --- a/deps/rabbit_common/mk/rabbitmq-run.mk +++ b/deps/rabbit_common/mk/rabbitmq-run.mk @@ -435,7 +435,7 @@ restart-cluster: -rabbitmq_web_stomp_examples listener [{port,$$((61633 + $$n - 1))}] \ -rabbitmq_prometheus tcp_config [{port,$$((15692 + $$n - 1))}] \ -rabbitmq_stream tcp_listeners [$$((5552 + $$n - 1))] \ - " & \ + "; \ done; \ wait