This is an automated email from the ASF dual-hosted git repository. chewbranca pushed a commit to branch couch-stats-resource-tracker in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 996c38551ae2a10ee16371bab30f5a06128aa102 Author: Russell Branca <chewbra...@apache.org> AuthorDate: Wed Nov 15 15:08:35 2023 -0800 Set dbname context properly --- src/fabric/src/fabric_rpc.erl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/fabric/src/fabric_rpc.erl b/src/fabric/src/fabric_rpc.erl index b5f41782a..bfd039aad 100644 --- a/src/fabric/src/fabric_rpc.erl +++ b/src/fabric/src/fabric_rpc.erl @@ -70,6 +70,7 @@ changes(DbName, #changes_args{} = Args, StartSeq, DbOptions) -> changes(DbName, [Args], StartSeq, DbOptions); changes(DbName, Options, StartVector, DbOptions) -> set_io_priority(DbName, DbOptions), + couch_stats_resource_tracker:set_context_dbname(DbName), Args0 = lists:keyfind(changes_args, 1, Options), #changes_args{dir = Dir, filter_fun = Filter} = Args0, Args = @@ -146,6 +147,7 @@ all_docs(DbName, Options, Args0) -> case fabric_util:upgrade_mrargs(Args0) of #mrargs{keys = undefined} = Args -> set_io_priority(DbName, Options), + couch_stats_resource_tracker:set_context_dbname(DbName), {ok, Db} = get_or_create_db(DbName, Options), CB = get_view_cb(Args), couch_mrview:query_all_docs(Db, Args, CB, Args) @@ -170,6 +172,7 @@ map_view(DbName, {DDocId, Rev}, ViewName, Args0, DbOptions) -> map_view(DbName, DDoc, ViewName, Args0, DbOptions); map_view(DbName, DDoc, ViewName, Args0, DbOptions) -> set_io_priority(DbName, DbOptions), + couch_stats_resource_tracker:set_context_dbname(DbName), Args = fabric_util:upgrade_mrargs(Args0), {ok, Db} = get_or_create_db(DbName, DbOptions), CB = get_view_cb(Args), @@ -184,6 +187,7 @@ reduce_view(DbName, {DDocId, Rev}, ViewName, Args0, DbOptions) -> reduce_view(DbName, DDoc, ViewName, Args0, DbOptions); reduce_view(DbName, DDoc, ViewName, Args0, DbOptions) -> set_io_priority(DbName, DbOptions), + couch_stats_resource_tracker:set_context_dbname(DbName), Args = fabric_util:upgrade_mrargs(Args0), {ok, Db} = get_or_create_db(DbName, DbOptions), VAcc0 = #vacc{db = Db}, @@ -327,6 +331,7 @@ reset_validation_funs(DbName) -> open_shard(Name, Opts) -> set_io_priority(Name, Opts), + couch_stats_resource_tracker:set_context_dbname(DbName), try rexi:reply(mem3_util:get_or_create_db(Name, Opts)) catch @@ -386,6 +391,7 @@ with_db(DbName, Options, {M, F, A}) -> read_repair_filter(DbName, Docs, NodeRevs, Options) -> set_io_priority(DbName, Options), + couch_stats_resource_tracker:set_context_dbname(DbName), case get_or_create_db(DbName, Options) of {ok, Db} -> try