Merge branch 'rickard/delayed-delete-node/OTP-12802'

* rickard/delayed-delete-node/OTP-12802:
  Delayed node table GC

1 files changed, 31 insertions, 16 deletions

diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index 2f505893b4..479e6f200a 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -73,6 +73,8 @@ init_per_suite(Config) ->
     Config.
 
 end_per_suite(_Config) ->
+    erts_debug:set_internal_state(available_internal_state, true),
+    erts_debug:set_internal_state(node_tab_delayed_delete, -1), %% restore original value
     available_internal_state(false).
 
 init_per_group(_GroupName, Config) ->
@@ -419,6 +421,8 @@ node_table_gc(doc) ->
     ["Tests that node tables are garbage collected."];
 node_table_gc(suite) -> [];
 node_table_gc(Config) when is_list(Config) ->
+    erts_debug:set_internal_state(available_internal_state, true),
+    erts_debug:set_internal_state(node_tab_delayed_delete, 0),
     ?line PreKnown = nodes(known),
     ?line ?t:format("PreKnown = ~p~n", [PreKnown]),
     ?line make_node_garbage(0, 200000, 1000, []),
@@ -428,6 +432,7 @@ node_table_gc(Config) when is_list(Config) ->
     ?line ?t:format("PostAreas = ~p~n", [PostAreas]),
     ?line true = length(PostKnown) =< length(PreKnown),
     ?line nc_refc_check(node()),
+    erts_debug:set_internal_state(node_tab_delayed_delete, -1), %% restore original value
     ?line ok.
 
 make_node_garbage(N, L, I, Ps) when N < L ->
@@ -579,6 +584,8 @@ node_controller_refc(doc) ->
      "as they should for entities controlling a connections."];
 node_controller_refc(suite) -> [];
 node_controller_refc(Config) when is_list(Config) ->
+    erts_debug:set_internal_state(available_internal_state, true),
+    erts_debug:set_internal_state(node_tab_delayed_delete, 0),
     ?line NodeFirstName = get_nodefirstname(),
     ?line ?line {ok, Node} = start_node(NodeFirstName),
     ?line true = lists:member(Node, nodes()),
@@ -606,6 +613,7 @@ node_controller_refc(Config) when is_list(Config) ->
     ?line false = get_dist_references(Node),
     ?line false = lists:member(Node, nodes(known)),
     ?line nc_refc_check(node()),
+    erts_debug:set_internal_state(node_tab_delayed_delete, -1), %% restore original value
     ?line ok.
 
 %%
@@ -686,9 +694,6 @@ timer_refc(doc) ->
      "as they should for data stored in bif timers."];
 timer_refc(suite) -> [];
 timer_refc(Config) when is_list(Config) ->
-    {skipped, "Test needs to be UPDATED for new timer implementation"}.
-
-timer_refc_test(Config) when is_list(Config) ->
     ?line RNode = {get_nodename(), 1},
     ?line RPid = mk_pid(RNode, 4711, 2),
     ?line RPort = mk_port(RNode, 4711),
@@ -992,23 +997,32 @@ check_nd_refc({ThisNodeName, ThisCreation}, NodeRefs, DistRefs, Fail) ->
 check_refc(ThisNodeName,ThisCreation,Table,EntryList) when is_list(EntryList) ->
     lists:foreach(
       fun ({Entry, Refc, ReferrerList}) ->
-	      FoundRefs =
+	      {DelayedDeleteTimer,
+	       FoundRefs} =
 		  lists:foldl(
-		    fun ({_Referrer, ReferencesList}, A1) ->
-			    A1 + lists:foldl(fun ({_T,Rs},A2) ->
-						     A2+Rs
-					     end,
-					     0,
-					     ReferencesList)
+		    fun ({Referrer, ReferencesList}, {DDT, A1}) ->
+			    {case Referrer of
+				 {system,delayed_delete_timer} ->
+				     true;
+				 _ ->
+				     DDT
+			     end,
+			     A1 + lists:foldl(fun ({_T,Rs},A2) ->
+						      A2+Rs
+					      end,
+					      0,
+					      ReferencesList)}
 		    end,
-		    0,
+		    {false, 0},
 		    ReferrerList),
 	      
-	      %% Reference count equals found references ?
-	      case Refc =:= FoundRefs of
-		  true ->
+	      %% Reference count equals found references?
+	      case {Refc, FoundRefs, DelayedDeleteTimer} of
+		  {X, X, _} ->
+		      ok;
+		  {0, 1, true} ->
 		      ok;
-		  false ->
+		  _ ->
 		      exit({invalid_reference_count, Table, Entry})
 	      end,
 
@@ -1016,7 +1030,8 @@ check_refc(ThisNodeName,ThisCreation,Table,EntryList) when is_list(EntryList) ->
 	      case {Entry, Refc} of
 		  {ThisNodeName, 0} -> ok;
 		  {{ThisNodeName, ThisCreation}, 0} -> ok;
-		  {_, 0} -> exit({not_referred_entry_in_table, Table, Entry});
+		  {_, 0} when DelayedDeleteTimer == false ->
+		      exit({not_referred_entry_in_table, Table, Entry});
 		  {_, _} -> ok 
 	      end