Merge pull request rabbitmq#923 from rabbitmq/rabbitmq-server-922

Discard any unexpected messages, such as late replies from gen_server
lucFM · Aug 16, 2016 · b02d325 · b02d325
2 parents 4d4144e + 878b6a0
commit b02d325
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/gm.erl b/src/gm.erl
@@ -757,7 +757,10 @@ handle_info({'DOWN', MRef, process, _Pid, Reason},
     catch
         lost_membership ->
             {stop, normal, State}
-    end.
+    end;
+handle_info(_, State) ->
+    %% Discard any unexpected messages, such as late replies from neighbour_call/2
+    noreply(State).
 
 terminate(Reason, #state { module = Module, callback_args = Args }) ->
     Module:handle_terminate(Args, Reason).

diff --git a/test/gm_SUITE.erl b/test/gm_SUITE.erl
@@ -38,7 +38,8 @@ all() ->
       broadcast,
       confirmed_broadcast,
       member_death,
-      receive_in_order
+      receive_in_order,
+      unexpected_msg
     ].
 
 init_per_suite(Config) ->
@@ -114,6 +115,14 @@ receive_in_order(_Config) ->
               passed
       end).
 
+unexpected_msg(_Config) ->
+    passed = with_two_members(
+	       fun(Pid, _) ->
+		       Pid ! {make_ref(), old_gen_server_answer},
+		       true = erlang:is_process_alive(Pid),
+		       passed
+	       end).
+
 do_broadcast(Fun) ->
     with_two_members(broadcast_fun(Fun)).