yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(dsraft): log a bit more informative messages in shard allocator

This commit is contained in:
Andrew Mayorov 2024-07-12 18:24:58 +02:00
parent 8e8b382ec0
commit af81800aec
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/emqx_ds_builtin_raft/src/emqx_ds_replication_shard_allocator.erl
View File

@ -232,8 +232,7 @@ apply_handler(Fun, DB, Shard, Trans) ->
erlang:apply(Fun, [DB, Shard, Trans]). erlang:apply(Fun, [DB, Shard, Trans]).
trans_add_local(DB, Shard, {add, Site}) -> trans_add_local(DB, Shard, {add, Site}) ->
logger:info(#{ ?tp(info, "Adding new local shard replica", #{
msg => "Adding new local shard replica",
site => Site, site => Site,
db => DB, db => DB,
shard => Shard shard => Shard
@ -246,8 +245,7 @@ do_add_local(membership = Stage, DB, Shard) ->
ok -> ok ->
do_add_local(readiness, DB, Shard); do_add_local(readiness, DB, Shard);
{error, recoverable, Reason} -> {error, recoverable, Reason} ->
logger:warning(#{ ?tp(warning, "Adding local shard replica failed", #{
msg => "Shard membership change failed",
db => DB, db => DB,
shard => Shard, shard => Shard,
reason => Reason, reason => Reason,
@ -260,10 +258,9 @@ do_add_local(readiness = Stage, DB, Shard) ->
LocalServer = emqx_ds_replication_layer_shard:local_server(DB, Shard), LocalServer = emqx_ds_replication_layer_shard:local_server(DB, Shard),
case emqx_ds_replication_layer_shard:server_info(readiness, LocalServer) of case emqx_ds_replication_layer_shard:server_info(readiness, LocalServer) of
ready -> ready ->
logger:info(#{msg => "Local shard replica ready", db => DB, shard => Shard}); ?tp(info, "Local shard replica ready", #{db => DB, shard => Shard});
Status -> Status ->
logger:warning(#{ ?tp(notice, "Still waiting for local shard replica to be ready", #{
msg => "Still waiting for local shard replica to be ready",
db => DB, db => DB,
shard => Shard, shard => Shard,
status => Status, status => Status,
@ -274,8 +271,7 @@ do_add_local(readiness = Stage, DB, Shard) ->
end. end.
trans_drop_local(DB, Shard, {del, Site}) -> trans_drop_local(DB, Shard, {del, Site}) ->
logger:info(#{ ?tp(notice, "Dropping local shard replica", #{
msg => "Dropping local shard replica",
site => Site, site => Site,
db => DB, db => DB,
shard => Shard shard => Shard
@ -287,10 +283,11 @@ do_drop_local(DB, Shard) ->
ok -> ok ->
ok = emqx_ds_builtin_raft_db_sup:stop_shard({DB, Shard}), ok = emqx_ds_builtin_raft_db_sup:stop_shard({DB, Shard}),
ok = emqx_ds_storage_layer:drop_shard({DB, Shard}), ok = emqx_ds_storage_layer:drop_shard({DB, Shard}),
logger:info(#{msg => "Local shard replica dropped"}); ?tp(notice, "Local shard replica dropped", #{db => DB, shard => Shard});
{error, recoverable, Reason} -> {error, recoverable, Reason} ->
logger:warning(#{ ?tp(warning, "Dropping local shard replica failed", #{
msg => "Shard membership change failed", db => DB,
shard => Shard,
reason => Reason, reason => Reason,
retry_in => ?TRANS_RETRY_TIMEOUT retry_in => ?TRANS_RETRY_TIMEOUT
}), }),
@ -299,8 +296,7 @@ do_drop_local(DB, Shard) ->
end. end.
trans_rm_unresponsive(DB, Shard, {del, Site}) -> trans_rm_unresponsive(DB, Shard, {del, Site}) ->
logger:info(#{ ?tp(notice, "Removing unresponsive shard replica", #{
msg => "Removing unresponsive shard replica",
site => Site, site => Site,
db => DB, db => DB,
shard => Shard shard => Shard
@ -311,10 +307,9 @@ do_rm_unresponsive(DB, Shard, Site) ->
Server = emqx_ds_replication_layer_shard:shard_server(DB, Shard, Site), Server = emqx_ds_replication_layer_shard:shard_server(DB, Shard, Site),
case emqx_ds_replication_layer_shard:remove_server(DB, Shard, Server) of case emqx_ds_replication_layer_shard:remove_server(DB, Shard, Server) of
ok -> ok ->
logger:info(#{msg => "Unresponsive shard replica removed", db => DB, shard => Shard}); ?tp(info, "Unresponsive shard replica removed", #{db => DB, shard => Shard});
{error, recoverable, Reason} -> {error, recoverable, Reason} ->
logger:warning(#{ ?tp(warning, "Removing shard replica failed", #{
msg => "Shard membership change failed",
db => DB, db => DB,
shard => Shard, shard => Shard,
reason => Reason, reason => Reason,
@ -376,8 +371,7 @@ handle_transition_exit(Shard, Trans, normal, State = #{db := DB}) ->
handle_transition_exit(_Shard, _Trans, {shutdown, skipped}, State) -> handle_transition_exit(_Shard, _Trans, {shutdown, skipped}, State) ->
State; State;
handle_transition_exit(Shard, Trans, Reason, State = #{db := DB}) -> handle_transition_exit(Shard, Trans, Reason, State = #{db := DB}) ->
logger:warning(#{ ?tp(warning, "Shard membership transition failed", #{
msg => "Shard membership transition failed",
db => DB, db => DB,
shard => Shard, shard => Shard,
transition => Trans, transition => Trans,