summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <klishinm@vmware.com>2022-10-29 00:28:14 +0400
committerGitHub <noreply@github.com>2022-10-29 00:28:14 +0400
commit13338e7fdc0a4957362c00610655ef8d6b144f5e (patch)
treefe32bafc8e40b3b1377e2d5c2a742780fdfe91fd
parentf802ba29efa2dcf72f1dfb7e64dc5525b3bb3191 (diff)
parentcdef416efd4487020918077ef90663595eafe2e0 (diff)
downloadrabbitmq-server-git-13338e7fdc0a4957362c00610655ef8d6b144f5e.tar.gz
Merge pull request #6281 from rabbitmq/mergify/bp/v3.11.x/pr-6280
Avoid crashing shovel plugin when another node goes down (backport #6280)
-rw-r--r--deps/rabbitmq_shovel/src/rabbit_shovel_status.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_status.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_status.erl
index b8e6dc7ccb..b14af6a64c 100644
--- a/deps/rabbitmq_shovel/src/rabbit_shovel_status.erl
+++ b/deps/rabbitmq_shovel/src/rabbit_shovel_status.erl
@@ -89,7 +89,12 @@ handle_cast({remove, Name}, State) ->
{noreply, State}.
handle_info(check, State) ->
- rabbit_shovel_dyn_worker_sup_sup:cleanup_specs(),
+ try
+ rabbit_shovel_dyn_worker_sup_sup:cleanup_specs()
+ catch
+ C:E ->
+ rabbit_log_shovel:warning("Recurring shovel spec clean up failed with ~p:~p", [C, E])
+ end,
{noreply, ensure_timer(State)};
handle_info(_Info, State) ->
{noreply, State}.