Merge pull request #3006 from rabbitmq/mk-emit-policy-update-event-after-schema-db-changes

Emit policy update event after schema database changes

(cherry picked from commit b341ced)

Conflicts:
	deps/rabbit/test/rabbit_ha_test_consumer.erl

Author: michaelklishin

deps/rabbit/src/rabbit_policy.erl

@@ -351,23 +351,23 @@ validate(_VHost, <<"operator_policy">>, Name, Term, _User) ->
       Name, operator_policy_validation(), Term).
 
 notify(VHost, <<"policy">>, Name, Term, ActingUser) ->
+    update_policies(VHost),
     rabbit_event:notify(policy_set, [{name, Name}, {vhost, VHost},
-                                     {user_who_performed_action, ActingUser} | Term]),
-    update_policies(VHost);
+                                     {user_who_performed_action, ActingUser} | Term]);
 notify(VHost, <<"operator_policy">>, Name, Term, ActingUser) ->
+    update_policies(VHost),
     rabbit_event:notify(policy_set, [{name, Name}, {vhost, VHost},
-                                     {user_who_performed_action, ActingUser} | Term]),
-    update_policies(VHost).
+                                     {user_who_performed_action, ActingUser} | Term]).
 
 notify_clear(VHost, <<"policy">>, Name, ActingUser) ->
+    update_policies(VHost),
     rabbit_event:notify(policy_cleared, [{name, Name}, {vhost, VHost},
-                                         {user_who_performed_action, ActingUser}]),
-    update_policies(VHost);
+                                         {user_who_performed_action, ActingUser}]);
 notify_clear(VHost, <<"operator_policy">>, Name, ActingUser) ->
+    update_policies(VHost),
     rabbit_event:notify(operator_policy_cleared,
                         [{name, Name}, {vhost, VHost},
-                         {user_who_performed_action, ActingUser}]),
-    update_policies(VHost).
+                         {user_who_performed_action, ActingUser}]).
 
 %%----------------------------------------------------------------------------
 

deps/rabbit/test/rabbit_ha_test_consumer.erl

@@ -54,9 +54,6 @@ run(TestPid, Channel, Queue, CancelOnFailover, LowestSeen, MsgsToConsume) ->
                     run(TestPid, Channel, Queue,
                         CancelOnFailover, MsgNum, MsgsToConsume - 1);
                 MsgNum >= LowestSeen ->
-                    error_logger:info_msg(
-                      "consumer ~p on ~p ignoring redelivered msg ~p~n",
-                      [self(), Channel, MsgNum]),
                     true = Redelivered, %% ASSERTION
                     run(TestPid, Channel, Queue,
                         CancelOnFailover, LowestSeen, MsgsToConsume);