Skip to content

Commit bb5f9cb

Browse files
kjnilssonmergify[bot]
authored andcommitted
QQ: improve fifo client log message on leader change
to capture the number of pending commands that will be resent (cherry picked from commit e7c624d)
1 parent 88c8362 commit bb5f9cb

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

deps/rabbit/src/rabbit_fifo_client.erl

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -644,20 +644,24 @@ handle_ra_event(_QName, _, {machine, {queue_status, Status}},
644644
%% just set the queue status
645645
{ok, State#state{queue_status = Status}, []};
646646
handle_ra_event(_QName, Leader, {machine, leader_change},
647-
#state{leader = OldLeader} = State0) ->
647+
#state{leader = OldLeader,
648+
pending = Pending} = State0) ->
648649
%% we need to update leader
649650
%% and resend any pending commands
650-
rabbit_log:debug("~ts: Detected QQ leader change from ~w to ~w",
651-
[?MODULE, OldLeader, Leader]),
651+
rabbit_log:debug("~ts: Detected QQ leader change from ~w to ~w, "
652+
"resending ~b pending commands",
653+
[?MODULE, OldLeader, Leader, maps:size(Pending)]),
652654
State = resend_all_pending(State0#state{leader = Leader}),
653655
{ok, State, []};
654656
handle_ra_event(_QName, _From, {rejected, {not_leader, Leader, _Seq}},
655657
#state{leader = Leader} = State) ->
656658
{ok, State, []};
657659
handle_ra_event(_QName, _From, {rejected, {not_leader, Leader, _Seq}},
658-
#state{leader = OldLeader} = State0) ->
659-
rabbit_log:debug("~ts: Detected QQ leader change (rejection) from ~w to ~w",
660-
[?MODULE, OldLeader, Leader]),
660+
#state{leader = OldLeader,
661+
pending = Pending} = State0) ->
662+
rabbit_log:debug("~ts: Detected QQ leader change (rejection) from ~w to ~w, "
663+
"resending ~b pending commands",
664+
[?MODULE, OldLeader, Leader, maps:size(Pending)]),
661665
State = resend_all_pending(State0#state{leader = Leader}),
662666
{ok, cancel_timer(State), []};
663667
handle_ra_event(_QName, _From, {rejected, {not_leader, _UndefinedMaybe, _Seq}}, State0) ->

0 commit comments

Comments
 (0)