Refactor

Author: dcorbacho

deps/rabbit/src/rabbit_channel_tracking.erl

@@ -23,7 +23,6 @@
          register_tracked/1,
          unregister_tracked/1,
          count_tracked_items_in/1,
-         clear_tracking_tables/0,
          shutdown_tracked_items/2]).
 
 -export([list/0, list_of_user/1, list_on_node/1,
@@ -49,7 +48,6 @@
 -spec boot() -> ok.
 
 boot() ->
-    clear_tracking_tables(),
     ok.
 
 -spec update_tracked(term()) -> ok.
@@ -109,17 +107,13 @@ handle_cast({user_deleted, Details}) ->
     %% Schedule user entry deletion, allowing time for connections to close
     _ = timer:apply_after(?TRACKING_EXECUTION_TIMEOUT, ?MODULE,
             delete_tracked_channel_user_entry, [Username]),
-    ok;
-handle_cast({node_deleted, _Details}) ->
     ok.
 
 -spec register_tracked(rabbit_types:tracked_channel()) -> ok.
 -dialyzer([{nowarn_function, [register_tracked/1]}]).
 
-register_tracked(TrackedCh = #tracked_channel{node = Node}) when Node == node() ->
-    register_tracked_ets(TrackedCh).
-
-register_tracked_ets(TrackedCh = #tracked_channel{pid = ChPid, username = Username}) ->
+register_tracked(TrackedCh = #tracked_channel{pid = ChPid, username = Username,
+                                              node = Node}) when Node == node() ->
     case ets:lookup(?TRACKED_CHANNEL_TABLE, ChPid) of
         []    ->
             ets:insert(?TRACKED_CHANNEL_TABLE, TrackedCh),
@@ -132,9 +126,6 @@ register_tracked_ets(TrackedCh = #tracked_channel{pid = ChPid, username = Userna
 
 -spec unregister_tracked_by_pid(pid()) -> any().
 unregister_tracked_by_pid(ChPid) when node(ChPid) == node() ->
-    unregister_tracked_by_pid_ets(ChPid).
-
-unregister_tracked_by_pid_ets(ChPid) ->
     case ets:lookup(?TRACKED_CHANNEL_TABLE, ChPid) of
         []     -> ok;
         [#tracked_channel{username = Username}] ->
@@ -148,9 +139,6 @@ unregister_tracked_by_pid_ets(ChPid) ->
 %% on it.
 -spec unregister_tracked(rabbit_types:tracked_channel_id()) -> ok.
 unregister_tracked(ChId = {Node, _Name}) when Node == node() ->
-    unregister_tracked_ets(ChId).
-
-unregister_tracked_ets(ChId) ->
     case get_tracked_channel_by_id_ets(ChId) of
         []     -> ok;
         [#tracked_channel{pid = ChPid, username = Username}] ->
@@ -160,10 +148,7 @@ unregister_tracked_ets(ChId) ->
 
 -spec count_tracked_items_in({atom(), rabbit_types:username()}) -> non_neg_integer().
 
-count_tracked_items_in(Type) ->
-    count_tracked_items_in_ets(Type).
-
-count_tracked_items_in_ets({user, Username}) ->
+count_tracked_items_in({user, Username}) ->
     rabbit_tracking:count_on_all_nodes(
       ?MODULE, count_local_tracked_items_of_user, [Username],
       ["channels of user ", Username]).
@@ -172,11 +157,6 @@ count_tracked_items_in_ets({user, Username}) ->
 count_local_tracked_items_of_user(Username) ->
     rabbit_tracking:read_ets_counter(?TRACKED_CHANNEL_TABLE_PER_USER, Username).
 
--spec clear_tracking_tables() -> ok.
-
-clear_tracking_tables() ->
-    ok.
-
 -spec shutdown_tracked_items(list(), term()) -> ok.
 
 shutdown_tracked_items(TrackedItems, _Args) ->
@@ -194,16 +174,13 @@ list() ->
 -spec list_of_user(rabbit_types:username()) -> [rabbit_types:tracked_channel()].
 
 list_of_user(Username) ->
-    list_of_user_ets(Username).
-
-list_of_user_ets(Username) ->
     rabbit_tracking:match_tracked_items_ets(
       ?TRACKED_CHANNEL_TABLE,
       #tracked_channel{username = Username, _ = '_'}).
 
 -spec list_on_node(node()) -> [rabbit_types:tracked_channel()].
 list_on_node(Node) when Node == node() ->
-    list_on_node_ets();
+    ets:tab2list(?TRACKED_CHANNEL_TABLE);
 list_on_node(Node) ->
     case rabbit_misc:rpc_call(Node, ?MODULE, list_on_node, [Node]) of
         List when is_list(List) ->
@@ -212,9 +189,6 @@ list_on_node(Node) ->
             []
     end.
 
-list_on_node_ets() ->
-    ets:tab2list(?TRACKED_CHANNEL_TABLE).
-
 -spec tracked_channel_table_name_for(node()) -> atom().
 
 tracked_channel_table_name_for(Node) ->
@@ -244,12 +218,9 @@ ensure_per_user_tracked_channels_table_for_this_node_ets() ->
     ets:new(?TRACKED_CHANNEL_TABLE_PER_USER, [named_table, public, {write_concurrency, true}]).
 
 get_tracked_channels_by_connection_pid(ConnPid) ->
-    get_tracked_channels_by_connection_pid_ets(ConnPid).
-
-get_tracked_channels_by_connection_pid_ets(ConnPid) ->
     rabbit_tracking:match_tracked_items_local(
-        ?TRACKED_CHANNEL_TABLE,
-        #tracked_channel{connection = ConnPid, _ = '_'}).
+      ?TRACKED_CHANNEL_TABLE,
+      #tracked_channel{connection = ConnPid, _ = '_'}).
 
 get_tracked_channel_by_id_ets(ChId) ->
     rabbit_tracking:match_tracked_items_ets(

deps/rabbit/src/rabbit_connection_tracking.erl

@@ -23,7 +23,6 @@
          register_tracked/1,
          unregister_tracked/1,
          count_tracked_items_in/1,
-         clear_tracking_tables/0,
          shutdown_tracked_items/2]).
 
 -export([tracked_connection_table_name_for/1,
@@ -196,11 +195,6 @@ count_local_tracked_items_in_vhost(VirtualHost) ->
 count_local_tracked_items_of_user(Username) ->
     rabbit_tracking:read_ets_counter(?TRACKED_CONNECTION_TABLE_PER_USER, Username).
 
--spec clear_tracking_tables() -> ok.
-
-clear_tracking_tables() ->
-    ok.
-
 -spec shutdown_tracked_items(list(), term()) -> ok.
 
 shutdown_tracked_items(TrackedItems, Message) ->

deps/rabbit/src/rabbit_connection_tracking_handler.erl

@@ -57,10 +57,6 @@ handle_event(#event{type = vhost_down, props = Details}, State) ->
 handle_event(#event{type = user_deleted, props = Details}, State) ->
     ok = rabbit_connection_tracking:update_tracked({user_deleted, Details}),
     {ok, State};
-%% A node had been deleted from the cluster.
-handle_event(#event{type = node_deleted, props = Details}, State) ->
-    ok = rabbit_connection_tracking:update_tracked({node_deleted, Details}),
-    {ok, State};
 handle_event(_Event, State) ->
     {ok, State}.
 

deps/rabbit/src/rabbit_tracking.erl

@@ -23,7 +23,6 @@
               rabbit_types:tracked_connection_id() |
                   rabbit_types:tracked_channel_id()) -> 'ok'.
 -callback count_tracked_items_in(term()) -> non_neg_integer().
--callback clear_tracking_tables() -> 'ok'.
 -callback shutdown_tracked_items(list(), term()) -> ok.
 
 -export([id/2, delete_tracked_entry/4, delete_tracked_entry_internal/4]).