Merge branch 'maint-21' into maint

* maint-21:
  Updated OTP version
  Update release notes
  Update version numbers
  kernel: Fix missing abort_connection in net_kernel
  Prevent inconsistent node lists
  Fix an endless rescheduling loop when a process is executing process_info(self(), ...)

6 files changed, 101 insertions, 3 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index bab7386da3..653a917823 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,34 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 10.0.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A process could get stuck in an infinite rescheduling
+	    loop between normal and dirty schedulers. This bug was
+	    introduced in ERTS version 10.0.</p>
+          <p>
+	    Thanks to Maxim Fedorov for finding and fixing this
+	    issue.</p>
+          <p>
+	    Own Id: OTP-15275 Aux Id: PR-1943 </p>
+        </item>
+        <item>
+          <p>
+	    Garbage collection of a distribution entry could cause an
+	    emulator crash if <c>net_kernel</c> had not brought
+	    previous connection attempts on it down properly.</p>
+          <p>
+	    Own Id: OTP-15279 Aux Id: ERIERL-226 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 10.0.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 146c00b07d..ceb89a6910 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -3615,6 +3615,12 @@ static Sint abort_connection(DistEntry* dep, Uint32 conn_id)
     return 0;
 }
 
+Sint
+erts_abort_connection(DistEntry *dep, Uint32 conn_id)
+{
+    return abort_connection(dep, conn_id);
+}
+
 BIF_RETTYPE erts_internal_abort_connection_2(BIF_ALIST_2)
 {
     DistEntry* dep;
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index dda2029a4c..30b4b35c20 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -399,5 +399,7 @@ extern void erts_kill_dist_connection(DistEntry *dep, Uint32);
 
 extern Uint erts_dist_cache_size(void);
 
+extern Sint erts_abort_connection(DistEntry *dep, Uint32 conn_id);
+
 
 #endif
diff --git a/erts/emulator/beam/erl_node_tables.c b/erts/emulator/beam/erl_node_tables.c
index 1f147011a8..9b34af1480 100644
--- a/erts/emulator/beam/erl_node_tables.c
+++ b/erts/emulator/beam/erl_node_tables.c
@@ -412,6 +412,44 @@ static void schedule_delete_dist_entry(DistEntry* dep)
 static void
 start_timer_delete_dist_entry(void *vdep)
 {
+    DistEntry *dep = vdep;
+    Eterm sysname;
+    enum dist_entry_state state;
+    Uint32 connection_id;
+
+    erts_de_rlock(dep);
+    state = dep->state;
+    connection_id = dep->connection_id;
+    sysname = dep->sysname;
+    erts_de_runlock(dep);
+
+    if (state != ERTS_DE_STATE_IDLE) {
+        char *state_str;
+        erts_dsprintf_buf_t *dsbuf = erts_create_logger_dsbuf();
+        switch (state) {
+        case ERTS_DE_STATE_CONNECTED:
+            state_str = "connected";
+            break;
+        case ERTS_DE_STATE_PENDING:
+            state_str = "pending connect";
+            break;
+        case ERTS_DE_STATE_EXITING:
+            state_str = "exiting";
+            break;
+        case ERTS_DE_STATE_IDLE:
+            state_str = "idle";
+            break;
+        default:
+            state_str = "unknown";
+            break;
+        }
+        erts_dsprintf(dsbuf, "Garbage collecting distribution "
+                      "entry for node %T in state: %s",
+                      sysname, state_str);
+        erts_send_error_to_logger_nogl(dsbuf);
+        erts_abort_connection(dep, connection_id);
+    }
+    
     if (node_tab_delete_delay == 0) {
         prepare_try_delete_dist_entry(vdep);
     }
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index 7df001fec5..55135fbcbc 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -50,7 +50,8 @@
          bad_nc/1,
          unique_pid/1,
          iter_max_procs/1,
-         magic_ref/1]).
+         magic_ref/1,
+         dist_entry_gc/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -58,7 +59,7 @@ suite() ->
 
 
 all() -> 
-    [term_to_binary_to_term_eq, round_trip_eq, cmp, ref_eq,
+    [dist_entry_gc, term_to_binary_to_term_eq, round_trip_eq, cmp, ref_eq,
      node_table_gc, dist_link_refc, dist_monitor_refc,
      node_controller_refc, ets_refc, match_spec_refc,
      timer_refc, pid_wrap, port_wrap, bad_nc,
@@ -894,6 +895,29 @@ magic_ref(Config) when is_list(Config) ->
     true = is_reference(MRef2),
     true = erts_debug:get_internal_state({magic_ref,MRef2}),
     ok.
+
+
+lost_pending_connection(Node) ->
+    _ = (catch erts_internal:new_connection(Node)),
+    ok.
+
+dist_entry_gc(Config) when is_list(Config) ->
+    Me = self(),
+    {ok, Node} = start_node(get_nodefirstname(), "+zdntgc 0"),
+    P = spawn_link(Node,
+                   fun () ->
+                           LostNode = list_to_atom("lost_pending_connection@" ++ hostname()),
+                           lost_pending_connection(LostNode),
+                           garbage_collect(), %% Could crash...
+                           Me ! {self(), ok}
+                   end),
+    receive
+        {P, ok} -> ok
+    end,
+    unlink(P),
+    stop_node(Node),
+    ok.
+
 %%
 %% -- Internal utils ---------------------------------------------------------
 %%
diff --git a/erts/vsn.mk b/erts/vsn.mk
index feb51e42d2..293b555b18 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 10.0.6
+VSN = 10.0.7
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3