@@ -255,8 +255,8 @@ process_command([], _Cmd) ->
255
255
process_command ([Server | Servers ], Cmd ) ->
256
256
case ra :process_command (Server , Cmd , ? CMD_TIMEOUT ) of
257
257
{timeout , _ } ->
258
- rabbit_log :warning (" Coordinator timeout on server ~p when processing command ~p " ,
259
- [Server , element (1 , Cmd )]),
258
+ rabbit_log :warning (" Coordinator timeout on server ~s when processing command ~W " ,
259
+ [Server , element (1 , Cmd ), 10 ]),
260
260
process_command (Servers , Cmd );
261
261
{error , noproc } ->
262
262
process_command (Servers , Cmd );
@@ -511,8 +511,8 @@ add_members(Members, [Node | Nodes]) ->
511
511
add_members (Members , Nodes )
512
512
end ;
513
513
Error ->
514
- rabbit_log :warning (" Stream coordinator failed to start on node ~p : ~p " ,
515
- [Node , Error ]),
514
+ rabbit_log :warning (" Stream coordinator failed to start on node ~s : ~W " ,
515
+ [Node , Error , 10 ]),
516
516
add_members (Members , Nodes )
517
517
end .
518
518
@@ -529,12 +529,11 @@ remove_members(Members, [Node | Nodes]) ->
529
529
-record (aux , {actions = #{} ::
530
530
#{pid () := {stream_id (), #{node := node (),
531
531
index := non_neg_integer (),
532
- epoch := osiris :epoch ()}}},
532
+ epoch := osiris :epoch ()}}},
533
533
resizer :: undefined | pid ()}).
534
534
535
535
init_aux (_Name ) ->
536
536
# aux {}.
537
- % {#{}, undefined}.
538
537
539
538
% % TODO ensure the dead writer is restarted as a replica at some point in time, increasing timeout?
540
539
handle_aux (leader , _ , maybe_resize_coordinator_cluster ,
@@ -667,10 +666,10 @@ phase_start_replica(StreamId, #{epoch := Epoch,
667
666
rabbit_log :warning (" ~s : Error while starting replica for ~s : ~W " ,
668
667
[? MODULE , maps :get (name , Conf0 ), Reason , 10 ]),
669
668
send_action_failed (StreamId , starting , Args )
670
- catch _ :E ->
671
- rabbit_log :warning (" ~s : Error while starting replica for ~s : ~p " ,
672
- [? MODULE , maps :get (name , Conf0 ), E ]),
673
- maybe_sleep (E ),
669
+ catch _ :Error ->
670
+ rabbit_log :warning (" ~s : Error while starting replica for ~s : ~W " ,
671
+ [? MODULE , maps :get (name , Conf0 ), Error , 10 ]),
672
+ maybe_sleep (Error ),
674
673
send_action_failed (StreamId , starting , Args )
675
674
end
676
675
end .
@@ -691,8 +690,8 @@ phase_delete_member(StreamId, #{node := Node} = Arg, Conf) ->
691
690
_ ->
692
691
send_action_failed (StreamId , deleting , Arg )
693
692
catch _ :E ->
694
- rabbit_log :warning (" ~s : Error while deleting member for ~s : on node ~s ~p " ,
695
- [? MODULE , StreamId , Node , E ]),
693
+ rabbit_log :warning (" ~s : Error while deleting member for ~s : on node ~s ~W " ,
694
+ [? MODULE , StreamId , Node , E , 10 ]),
696
695
maybe_sleep (E ),
697
696
send_action_failed (StreamId , deleting , Arg )
698
697
end
@@ -727,11 +726,11 @@ phase_stop_member(StreamId, #{node := Node,
727
726
[StreamId , Node , Err ]),
728
727
send_action_failed (StreamId , stopping , Arg0 )
729
728
catch _ :Err ->
730
- rabbit_log :warning (" Stream coordinator failed to stop
729
+ rabbit_log :warning (" Stream coordinator failed to stop
731
730
member ~s ~w Error: ~w " ,
732
- [StreamId , Node , Err ]),
733
- maybe_sleep (Err ),
734
- send_action_failed (StreamId , stopping , Arg0 )
731
+ [StreamId , Node , Err ]),
732
+ maybe_sleep (Err ),
733
+ send_action_failed (StreamId , stopping , Arg0 )
735
734
end
736
735
end .
737
736
@@ -871,7 +870,7 @@ filter_command(_Meta, {delete_replica, _, #{node := Node}}, #stream{id = StreamI
871
870
case maps :size (Members ) =< 1 of
872
871
true ->
873
872
rabbit_log :warning (
874
- " ~s failed to delete replica on node ~p for stream ~s : refusing to delete the only replica" ,
873
+ " ~s failed to delete replica on node ~s for stream ~s : refusing to delete the only replica" ,
875
874
[? MODULE , Node , StreamId ]),
876
875
{error , last_stream_member };
877
876
false ->
@@ -886,8 +885,8 @@ update_stream(Meta, Cmd, Stream) ->
886
885
catch
887
886
_ :E :Stacktrace ->
888
887
rabbit_log :warning (
889
- " ~s failed to update stream:~n~p ~n~p " ,
890
- [? MODULE , E , Stacktrace ]),
888
+ " ~s failed to update stream:~n~W ~n~W " ,
889
+ [? MODULE , E , 10 , Stacktrace , 10 ]),
891
890
Stream
892
891
end .
893
892
0 commit comments