Shovels: return hosting node in terminated shovel status

Fixes deletion and restart

Author: dcorbacho

deps/rabbitmq_shovel/src/Elixir.RabbitMQ.CLI.Ctl.Commands.DeleteShovelCommand.erl

@@ -82,6 +82,9 @@ run([Name], #{node := Node, vhost := VHost, force := Force}) ->
                     {error, rabbit_data_coercion:to_binary(ErrMsg)};
                 {{_Name, _VHost}, _Type, {terminated, _}, _Metrics, _Timestamp} ->
                     delete_shovel(ErrMsg, VHost, Name, ActingUser, Node, Node);
+                {{_Name, _VHost}, _Type, {terminated, Opts, _}, _Metrics, _Timestamp} ->
+                    HostingNode = proplists:get_value(node, Opts, Node),
+                    delete_shovel(ErrMsg, VHost, Name, ActingUser, HostingNode, Node);
                 {{_Name, _VHost}, _Type, {_State, Opts}, _Metrics, _Timestamp} ->
                     HostingNode = proplists:get_value(node, Opts, Node),
                     delete_shovel(ErrMsg, VHost, Name, ActingUser, HostingNode, Node);

deps/rabbitmq_shovel/src/Elixir.RabbitMQ.CLI.Ctl.Commands.RestartShovelCommand.erl

@@ -62,6 +62,8 @@ run([Name], #{node := Node, vhost := VHost}) ->
             case rabbit_shovel_status:find_matching_shovel(VHost, Name, Xs) of
                 undefined ->
                     {error, rabbit_data_coercion:to_binary(ErrMsg)};
+                {{_Name, _VHost}, _Type, {terminated, Opts, _}, _Metrics, _Timestamp} ->
+                    restart_shovel(ErrMsg, Name, VHost, Opts);
                 {{_Name, _VHost}, _Type, {_State, Opts}, _Metrics, _Timestamp} ->
                     restart_shovel(ErrMsg, Name, VHost, Opts);
                 {{_Name, _VHost}, _Type, {_State, Opts}, _Timestamp} ->

deps/rabbitmq_shovel/src/rabbit_shovel_status.erl

@@ -42,6 +42,9 @@
 -type info() :: starting
               | {running, proplists:proplist()}
               | {terminated, term()}.
+-type info_with_node() :: starting
+                        | {running, proplists:proplist()}
+                        | {terminated, proplists:proplist(), term()}.
 -type blocked_status() :: running | flow | blocked.
 -type shovel_status() :: blocked_status() | ignore.
 
@@ -52,7 +55,7 @@
                      pending := rabbit_types:option(non_neg_integer()),
                      forwarded := rabbit_types:option(non_neg_integer())
                     } | #{}.
--type status_tuple_41x() :: {name(), type(), info(), metrics(), calendar:datetime()}.
+-type status_tuple_41x() :: {name(), type(), info() | info_with_node(), metrics(), calendar:datetime()}.
 -type status_tuple_40x_and_older() :: {name(), type(), info(), calendar:datetime()}.
 -type status_tuple() :: status_tuple_41x() | status_tuple_40x_and_older().
 
@@ -216,7 +219,7 @@ inject_node_info(Node, Shovels) ->
              {Name, Type, {State, Opts}, Metrics, Timestamp};
            %% terminated
            ({Name, Type, {terminated, Reason}, Metrics, Timestamp}) ->
-             {Name, Type, {terminated, Reason}, Metrics, Timestamp};
+             {Name, Type, {terminated, [{node, Node}], Reason}, Metrics, Timestamp};
             %% running
            ({Name, Type, {State, Opts}, Metrics, Timestamp}) ->
              Opts1 = Opts ++ [{node, Node}],