This is an automated email from the ASF dual-hosted git repository. vatamane pushed a commit to branch improve-mem3-find-source-logging in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 7595d30ce3e825622d729c1f9c26c7eca6a2c2b1 Author: Nick Vatamaniuc <[email protected]> AuthorDate: Thu Jul 3 16:06:45 2025 -0400 Improve mem3_rep:find_source_seq/4 logging * When: we don't find the checkpoint doc at all log just the db name, not the whole `#db{}` record. * When we don't find a suitable history entry, log db name, otherwise it's impossible to tell which db it refers to. --- src/mem3/src/mem3_rep.erl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mem3/src/mem3_rep.erl b/src/mem3/src/mem3_rep.erl index 3df07a9fd..06e60418e 100644 --- a/src/mem3/src/mem3_rep.erl +++ b/src/mem3/src/mem3_rep.erl @@ -217,20 +217,21 @@ verify_purge_checkpoint(DbName, Props) -> %% looking for our push replication history and choosing the %% largest source_seq that has a target_seq =< TgtSeq. find_source_seq(SrcDb, TgtNode, TgtUUIDPrefix, TgtSeq) -> + SrcDbName = couch_db:name(SrcDb), case find_repl_doc(SrcDb, TgtUUIDPrefix) of {ok, TgtUUID, Doc} -> SrcNode = atom_to_binary(config:node_name(), utf8), - find_source_seq_int(Doc, SrcNode, TgtNode, TgtUUID, TgtSeq); + find_source_seq_int(SrcDbName, Doc, SrcNode, TgtNode, TgtUUID, TgtSeq); {not_found, _} -> couch_log:warning( "~p find_source_seq repl doc not_found " "src_db: ~p, tgt_node: ~p, tgt_uuid_prefix: ~p, tgt_seq: ~p", - [?MODULE, SrcDb, TgtNode, TgtUUIDPrefix, TgtSeq] + [?MODULE, SrcDbName, TgtNode, TgtUUIDPrefix, TgtSeq] ), 0 end. -find_source_seq_int(#doc{body = {Props}}, SrcNode0, TgtNode0, TgtUUID, TgtSeq) -> +find_source_seq_int(SrcDbName, #doc{body = {Props}}, SrcNode0, TgtNode0, TgtUUID, TgtSeq) -> SrcNode = case is_atom(SrcNode0) of true -> atom_to_binary(SrcNode0, utf8); @@ -262,9 +263,9 @@ find_source_seq_int(#doc{body = {Props}}, SrcNode0, TgtNode0, TgtUUID, TgtSeq) - [] -> couch_log:warning( "~p find_source_seq_int nil useable history " - "src_node: ~p, tgt_node: ~p, tgt_uuid: ~p, tgt_seq: ~p, " + "src_db: ~s src_node: ~p, tgt_node: ~p, tgt_uuid: ~p, tgt_seq: ~p, " "src_history: ~p", - [?MODULE, SrcNode, TgtNode, TgtUUID, TgtSeq, SrcHistory] + [?MODULE, SrcDbName, SrcNode, TgtNode, TgtUUID, TgtSeq, SrcHistory] ), 0 end.
