File 0809-Do-not-crash-warn-in-group_history-during-disk_log-s.patch of Package erlang

From 4d7a2e58c950983294487563877bdbac40224d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Wed, 26 Jun 2019 09:17:04 +0200
Subject: [PATCH] Do not crash/warn in group_history during disk_log shutdown

Because the disk_log is started after the `user` process, there
is a chance for race conditions on shutdown, where disk_log will
terminate before `group`, which will fail to log.

Furthermore, if disk_log terminates BEFORE the shell starts,
then the whole shell will fail to start, which will trigger
another shell recursively, until the system finally shuts down.
This can be reproduced with this command:

    $ erl -kernel shell_history true -s init restart
---
 lib/kernel/src/group_history.erl            | 18 +++++++++++++++---
 lib/kernel/test/interactive_shell_SUITE.erl | 28 ++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/lib/kernel/src/group_history.erl b/lib/kernel/src/group_history.erl
index 9745848992..e69fa85492 100644
--- a/lib/kernel/src/group_history.erl
+++ b/lib/kernel/src/group_history.erl
@@ -44,7 +44,7 @@ load() ->
     wait_for_kernel_safe_sup(),
     case history_status() of
         enabled ->
-            case open_log() of
+            try open_log() of
                 {ok, ?LOG_NAME} ->
                     read_full_log(?LOG_NAME);
                 {repaired, ?LOG_NAME, {recovered, Good}, {badbytes, Bad}} ->
@@ -68,6 +68,10 @@ load() ->
                     handle_open_error(Reason),
                     disable_history(),
                     []
+            catch
+                % disk_log shut down abruptly, possibly because
+                % the node is shutting down. Ignore it.
+                exit:_ -> []
             end;
         _ ->
             []
@@ -127,7 +131,7 @@ repair_log(Name) ->
 %% Return whether the shell history is enabled or not
 -spec history_status() -> enabled | disabled.
 history_status() ->
-    case is_user() orelse application:get_env(kernel, shell_history) of
+    case is_user() orelse init_running() orelse application:get_env(kernel, shell_history) of
         true -> disabled; % don't run for user proc
         {ok, enabled} -> enabled;
         undefined -> ?DEFAULT_STATUS;
@@ -142,6 +146,14 @@ is_user() ->
         _ -> false
     end.
 
+%% Return if the system is running (not stopping)
+-spec init_running() -> boolean().
+init_running() ->
+    case init:get_status() of
+        {stopping, _} -> false;
+        _ -> true
+    end.
+
 %% Open a disk_log file while ensuring the required path is there.
 open_log() ->
     Opts = log_options(),
@@ -322,7 +334,7 @@ show_unexpected_warning({M,F,A}, Term) ->
 
 show_unexpected_close_warning() ->
     show('$#erlang-history-unexpected-close',
-         "The shell log file has mysteriousy closed. Ignoring "
+         "The shell log file has mysteriously closed. Ignoring "
          "currently unread history.~n", []).
 
 show_size_warning(_Current, _New) ->
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index 173e25c520..883abda067 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -22,7 +22,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
 	 get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
-	 job_control_remote/1,
+	 job_control_remote/1,stop_during_init/1,
 	 job_control_remote_noshell/1,ctrl_keys/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -42,7 +42,7 @@ all() ->
 all() -> 
     [get_columns_and_rows, exit_initial, job_control_local,
      job_control_remote, job_control_remote_noshell,
-     ctrl_keys].
+     ctrl_keys, stop_during_init].
 
 groups() -> 
     [].
@@ -149,6 +149,22 @@ exit_initial(Config) when is_list(Config) ->
 		    {getline_re,"35"}],[])
     end.
 
+stop_during_init(Config) when is_list(Config) ->
+    case get_progs() of
+	{error,_Reason} ->
+	    {skip,"No runerl present"};
+	{RunErl,_ToErl,Erl} ->
+	    case create_tempdir() of
+		{error, Reason2} ->
+		    {skip, Reason2};
+		Tempdir ->
+		    XArg = " -kernel shell_history true -s init stop",
+		    start_runerl_command(RunErl, Tempdir, "\\\""++Erl++"\\\""++XArg),
+		    {ok, Binary} = file:read_file(filename:join(Tempdir, "erlang.log.1")),
+		    nomatch = binary:match(Binary, <<"*** ERROR: Shell process terminated! ***">>)
+	    end
+     end.
+
 %% Tests that local shell can be started by means of job control.
 job_control_local(Config) when is_list(Config) ->
     case proplists:get_value(default_shell,Config) of
@@ -600,10 +616,10 @@ start_runerl_node(RunErl,Erl,Tempdir,Nodename) ->
 				end)++
 		       " -setcookie "++atom_to_list(erlang:get_cookie())
 	   end,
-    spawn(fun() ->
-		  os:cmd("\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++" \""++
-			     Erl++XArg++"\"")
-	  end).
+    spawn(fun() -> start_runerl_command(RunErl, Tempdir, Erl++XArg) end).
+
+start_runerl_command(RunErl, Tempdir, Cmd) ->
+    os:cmd("\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++" \""++Cmd++"\"").
 
 start_toerl_server(ToErl,Tempdir) ->
     Pid = spawn(?MODULE,toerl_server,[self(),ToErl,Tempdir]),
-- 
2.16.4