erts/kernel: Fix code loading deadlock during init:stop

When init:stop is called it walks the application hierarchy
and terminates each process. Some of these processes may do
something while terminating and sometimes that something
needs to load some new code in order to work. When this happens
the code_server could just be in the process of terminating
or the erl_prim_loader could be active. In both these cases
the request to load the new code would cause a deadlock in the
termination of the system.

This commit fixes this by init rejecting attempts to load new code
when init:stop has been called and fixing a termination race in
the code_server.

This however means that the process that tried to do something
when told to terminate (for instance logging that it is terminating)
will crash instead of loading the code.

2 files changed, 2 insertions, 3 deletions

diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index b856bff4fe..f0344fd6ba 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 45468b3b9c..67929c53c2 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -423,9 +423,6 @@ loop(State) ->
 	    Loaded = State#state.loaded, %% boot_loop but is handled here 
 	    From ! {init,Loaded},        %% anyway.
 	    loop(State);
-	{From, {ensure_loaded, _}} ->
-	    From ! {init, not_allowed},
-	    loop(State);
 	Msg ->
 	    loop(handle_msg(Msg,State))
     end.
@@ -465,6 +462,8 @@ do_handle_msg(Msg,State) ->
 		    From ! {init,ok},
 		    {new_state,State#state{subscribed = [Pid|Subscribed]}}
 	    end;
+	{From, {ensure_loaded, _}} ->
+	    From ! {init, not_allowed};
 	X ->
 	    case whereis(user) of
 		undefined ->