This is an automated email from the ASF dual-hosted git repository. chewbranca pushed a commit to branch couch-stats-resource-tracker-v3-rebase-http-main in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 49ded41dc79de4f3e9ddc1e3bf0010dd64c0689e Author: Russell Branca <[email protected]> AuthorDate: Wed Jun 25 22:19:06 2025 -0700 Tidy up various bits --- src/chttpd/test/eunit/chttpd_db_doc_size_tests.erl | 7 +++---- src/couch/include/couch_db.hrl | 2 -- src/couch/priv/stats_descriptions.cfg | 4 ---- src/couch/src/couch_btree.erl | 1 - src/couch/src/couch_db.erl | 2 -- src/couch/src/couch_query_servers.erl | 2 -- src/couch/src/couch_server.erl | 1 - src/couch_stats/src/couch_stats_resource_tracker.hrl | 2 ++ src/couch_stats/src/csrt.erl | 20 ++++++++++---------- src/fabric/priv/stats_descriptions.cfg | 3 --- src/mango/src/mango_cursor_view.erl | 2 -- src/mango/src/mango_selector.erl | 1 - 12 files changed, 15 insertions(+), 32 deletions(-) diff --git a/src/chttpd/test/eunit/chttpd_db_doc_size_tests.erl b/src/chttpd/test/eunit/chttpd_db_doc_size_tests.erl index da60e85e6..01ef16f23 100644 --- a/src/chttpd/test/eunit/chttpd_db_doc_size_tests.erl +++ b/src/chttpd/test/eunit/chttpd_db_doc_size_tests.erl @@ -24,9 +24,8 @@ setup() -> Hashed = couch_passwords:hash_admin_password(?PASS), - ok = config:set("admins", ?USER, ?b2l(Hashed), false), - ok = config:set("couchdb", "max_document_size", "50", false), - + ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist = false), + ok = config:set("couchdb", "max_document_size", "50"), TmpDb = ?tempdb(), Addr = config:get("chttpd", "bind_address", "127.0.0.1"), Port = mochiweb_socket_server:get(chttpd, port), @@ -36,7 +35,7 @@ setup() -> teardown(Url) -> delete_db(Url), - ok = config:delete("admins", ?USER, false), + ok = config:delete("admins", ?USER, _Persist = false), ok = config:delete("couchdb", "max_document_size"). create_db(Url) -> diff --git a/src/couch/include/couch_db.hrl b/src/couch/include/couch_db.hrl index ba6bd38ca..9c1df21b6 100644 --- a/src/couch/include/couch_db.hrl +++ b/src/couch/include/couch_db.hrl @@ -53,8 +53,6 @@ -define(INTERACTIVE_EDIT, interactive_edit). -define(REPLICATED_CHANGES, replicated_changes). --define(LOG_UNEXPECTED_MSG(Msg), couch_log:warning("[~p:~p:~p/~p]{~p[~p]} Unexpected message: ~w", [?MODULE, ?LINE, ?FUNCTION_NAME, ?FUNCTION_ARITY, self(), element(2, process_info(self(), message_queue_len)), Msg])). - -type branch() :: {Key::term(), Value::term(), Tree::term()}. -type path() :: {Start::pos_integer(), branch()}. -type update_type() :: replicated_changes | interactive_edit. diff --git a/src/couch/priv/stats_descriptions.cfg b/src/couch/priv/stats_descriptions.cfg index ade882c07..7597e8fc3 100644 --- a/src/couch/priv/stats_descriptions.cfg +++ b/src/couch/priv/stats_descriptions.cfg @@ -422,10 +422,6 @@ {type, counter}, {desc, <<"number of other requests">>} ]}. -{[couchdb, query_server, volume, ddoc_filter], [ - {type, counter}, - {desc, <<"number of docs filtered by ddoc filters">>} -]}. {[couchdb, legacy_checksums], [ {type, counter}, {desc, <<"number of legacy checksums found in couch_file instances">>} diff --git a/src/couch/src/couch_btree.erl b/src/couch/src/couch_btree.erl index ba176cca2..628388194 100644 --- a/src/couch/src/couch_btree.erl +++ b/src/couch/src/couch_btree.erl @@ -472,7 +472,6 @@ reduce_tree_size(kp_node, NodeSize, [{_K, {_P, _Red, Sz}} | NodeList]) -> get_node(#btree{fd = Fd}, NodePos) -> {ok, {NodeType, NodeList}} = couch_file:pread_term(Fd, NodePos), - %% TODO: wire in csrt tracking couch_stats:increment_counter([couchdb, btree, get_node, NodeType]), {NodeType, NodeList}. diff --git a/src/couch/src/couch_db.erl b/src/couch/src/couch_db.erl index 694e82936..e33e695c0 100644 --- a/src/couch/src/couch_db.erl +++ b/src/couch/src/couch_db.erl @@ -298,7 +298,6 @@ open_doc(Db, IdOrDocInfo) -> open_doc(Db, IdOrDocInfo, []). open_doc(Db, Id, Options) -> - %% TODO: wire in csrt tracking increment_stat(Db, [couchdb, database_reads]), case open_doc_int(Db, Id, Options) of {ok, #doc{deleted = true} = Doc} -> @@ -1988,7 +1987,6 @@ increment_stat(#db{options = Options}, Stat, Count) when -> case lists:member(sys_db, Options) of true -> - %% TODO: we shouldn't leak resource usage just because it's a sys_db ok; false -> couch_stats:increment_counter(Stat, Count) diff --git a/src/couch/src/couch_query_servers.erl b/src/couch/src/couch_query_servers.erl index 2d5185806..d32d02f80 100644 --- a/src/couch/src/couch_query_servers.erl +++ b/src/couch/src/couch_query_servers.erl @@ -542,8 +542,6 @@ filter_docs(Req, Db, DDoc, FName, Docs) -> {ok, filter_docs_int(Db, DDoc, FName, JsonReq, JsonDocs)} catch throw:{os_process_error, {exit_status, 1}} -> - %% TODO: wire in csrt tracking - couch_stats:increment_counter([couchdb, query_server, js_filter_error]), %% batch used too much memory, retry sequentially. Fun = fun(JsonDoc) -> filter_docs_int(Db, DDoc, FName, JsonReq, [JsonDoc]) diff --git a/src/couch/src/couch_server.erl b/src/couch/src/couch_server.erl index 42ba80b1e..548c481cb 100644 --- a/src/couch/src/couch_server.erl +++ b/src/couch/src/couch_server.erl @@ -114,7 +114,6 @@ sup_start_link(N) -> gen_server:start_link({local, couch_server(N)}, couch_server, [N], []). open(DbName, Options) -> - %% TODO: wire in csrt tracking couch_stats:increment_counter([couchdb, couch_server, open]), try validate_open_or_create(DbName, Options), diff --git a/src/couch_stats/src/couch_stats_resource_tracker.hrl b/src/couch_stats/src/couch_stats_resource_tracker.hrl index 9b52826c7..739d8a6d5 100644 --- a/src/couch_stats/src/couch_stats_resource_tracker.hrl +++ b/src/couch_stats/src/couch_stats_resource_tracker.hrl @@ -41,6 +41,8 @@ -define(CONF_MATCHERS_ENABLED, "csrt_logger.matchers_enabled"). -define(CONF_MATCHERS_THRESHOLD, "csrt_logger.matchers_threshold"). -define(CONF_MATCHERS_DBNAMES, "csrt_logger.dbnames_io"). + +%% matcher query magnitude default limitations -define(QUERY_CARDINALITY_LIMIT, 10_000). -define(QUERY_LIMIT, 100). diff --git a/src/couch_stats/src/csrt.erl b/src/couch_stats/src/csrt.erl index d432ea990..ce6b38474 100644 --- a/src/couch_stats/src/csrt.erl +++ b/src/couch_stats/src/csrt.erl @@ -25,7 +25,7 @@ set_pid_ref/1 ]). -%% Context API +%% Context Lifecycle API -export([ create_context/2, create_coordinator_context/2, @@ -52,7 +52,7 @@ to_json/1 ]). -%% stats collection api +%% Stats Collection API -export([ accumulate_delta/1, add_delta/2, @@ -71,13 +71,13 @@ should_track_init_p/1 ]). -%% RPC api +%% RPC API -export([ rpc/2, call/1 ]). -%% aggregate query api +%% Aggregate Query API -export([ active/0, active/1, @@ -114,7 +114,7 @@ ]). %% -%% RPC operations +%% RPC Operations %% -spec rpc(FName :: atom(), Args :: [any()]) -> @@ -178,7 +178,7 @@ call({FunName, Args}) -> {error, <<"No such function '", FunNameBin/binary, "/", ArityBin/binary>>}. %% -%% PidRef operations +%% PidRef Operations %% -spec get_pid_ref() -> maybe_pid_ref(). @@ -208,7 +208,7 @@ destroy_pid_ref(_PidRef) -> erase(?PID_REF). %% -%% Context lifecycle API +%% Context Lifecycle API %% -spec create_worker_context(From, MFA, Nonce) -> pid_ref() | false when @@ -248,7 +248,7 @@ create_context(Type, Nonce) -> catch _:_ -> csrt_server:destroy_resource(PidRef), - %% destroy_context(PidRef) clears the tracker too + %% calling destroy_context(PidRef) clears the tracker too destroy_context(PidRef), false end. @@ -372,7 +372,7 @@ to_json(Rctx) -> csrt_entry:to_json(Rctx). %% -%% Stat collection API +%% Stat Collection API %% -spec inc(Key :: rctx_field()) -> non_neg_integer(). @@ -443,7 +443,7 @@ rctx_delta(TA, TB) -> csrt_util:rctx_delta(TA, TB). %% -%% aggregate query api +%% Aggregate Query API %% -spec active() -> [rctx()]. diff --git a/src/fabric/priv/stats_descriptions.cfg b/src/fabric/priv/stats_descriptions.cfg index 9ab054bf0..2374907a9 100644 --- a/src/fabric/priv/stats_descriptions.cfg +++ b/src/fabric/priv/stats_descriptions.cfg @@ -29,9 +29,6 @@ %% fabric_rpc worker stats -%% TODO: decide on which naming scheme: -%% {[fabric_rpc, get_all_security, spawned], [ -%% {[fabric_rpc, spawned, get_all_security], [ {[fabric_rpc, get_all_security, spawned], [ {type, counter}, {desc, <<"number of fabric_rpc worker get_all_security spawns">>} diff --git a/src/mango/src/mango_cursor_view.erl b/src/mango/src/mango_cursor_view.erl index e11c69416..0928ae193 100644 --- a/src/mango/src/mango_cursor_view.erl +++ b/src/mango/src/mango_cursor_view.erl @@ -245,11 +245,9 @@ execute(#cursor{db = Db, index = Idx, execution_stats = Stats} = Cursor0, UserFu Result = case mango_idx:def(Idx) of all_docs -> - couch_stats:increment_counter([mango_cursor, view, all_docs]), CB = fun ?MODULE:handle_all_docs_message/2, fabric:all_docs(Db, DbOpts, CB, Cursor, Args); _ -> - couch_stats:increment_counter([mango_cursor, view, idx]), CB = fun ?MODULE:handle_message/2, % Normal view DDoc = ddocid(Idx), diff --git a/src/mango/src/mango_selector.erl b/src/mango/src/mango_selector.erl index d8d2c913c..42031b756 100644 --- a/src/mango/src/mango_selector.erl +++ b/src/mango/src/mango_selector.erl @@ -50,7 +50,6 @@ normalize(Selector) -> % This assumes that the Selector has been normalized. % Returns true or false. match(Selector, D) -> - %% TODO: wire in csrt tracking couch_stats:increment_counter([mango, evaluate_selector]), match_int(Selector, D).
