Merge remote branch 'origin/peppe/common_test/ct_master_evh'

* origin/peppe/common_test/ct_master_evh:
  Fix problem with hanging event handler

OTP-10634

2 files changed, 19 insertions, 5 deletions

diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index e516f635d2..b42ff73846 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -428,7 +428,7 @@ master_loop(#state{node_ctrl_pids=[],
     log(all,"TEST RESULTS",Str,[]),
     log(all,"Info","Updating log files",[]),
     refresh_logs(LogDirs,[]),
-
+    
     ct_master_event:stop(),
     ct_master_logs:stop(),
     ok;
diff --git a/lib/common_test/src/ct_master_event.erl b/lib/common_test/src/ct_master_event.erl
index 5877b7c6f2..fd97ab16f7 100644
--- a/lib/common_test/src/ct_master_event.erl
+++ b/lib/common_test/src/ct_master_event.erl
@@ -66,16 +66,30 @@ add_handler(Args) ->
 %% Description: Stops the event manager
 %%--------------------------------------------------------------------
 stop() ->
-    flush(),
-    gen_event:stop(?CT_MEVMGR_REF).
+    case flush() of
+	{error,Reason} ->
+	    ct_master_logs:log("Error",
+			       "No response from CT Master Event.\n"
+			       "Reason = ~p\n"
+			       "Terminating now!\n",[Reason]),
+	    %% communication with event manager fails, kill it
+	    catch exit(whereis(?CT_MEVMGR_REF), kill);
+	_ ->
+	    gen_event:stop(?CT_MEVMGR_REF)
+    end.
 
 flush() ->
-    case gen_event:call(?CT_MEVMGR_REF,?MODULE,flush) of
+    try gen_event:call(?CT_MEVMGR_REF,?MODULE,flush,1800000) of
 	flushing ->
 	    timer:sleep(1),
 	    flush();
 	done ->
-	    ok
+	    ok;
+	Error = {error,_} ->
+	    Error
+    catch
+	_:Reason ->
+	    {error,Reason}
     end.
 
 %%--------------------------------------------------------------------