diff options
| author | Robert Newson <rnewson@apache.org> | 2021-03-24 09:44:40 +0000 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2021-03-24 09:44:40 +0000 |
| commit | f8024910d3dafb369d1268232143d6b17661606a (patch) | |
| tree | 03dfce153e0e70708c9a720a02d9fb6c830ba392 | |
| parent | 814da7958fc884eb672f84bad85f88fa5b6fc63b (diff) | |
| download | couchdb-couch_server_shard_simplification.tar.gz | |
Revert "Add "couch_server" aggregate to _system output"couch_server_shard_simplification
This reverts commit 5724e8e3f35839f67e15dfca478a2b80103127b4.
| -rw-r--r-- | src/chttpd/src/chttpd_node.erl | 3 | ||||
| -rw-r--r-- | src/couch/src/couch_server.erl | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/chttpd/src/chttpd_node.erl b/src/chttpd/src/chttpd_node.erl index 734c49bd7..6407df106 100644 --- a/src/chttpd/src/chttpd_node.erl +++ b/src/chttpd/src/chttpd_node.erl @@ -209,8 +209,7 @@ get_stats() -> {NumberOfGCs, WordsReclaimed, _} = statistics(garbage_collection), {{input, Input}, {output, Output}} = statistics(io), {CF, CDU} = db_pid_stats(), - MessageQueues0 = [{couch_file, {CF}}, {couch_db_updater, {CDU}}, - {couch_server, couch_server:aggregate_queue_len()}], + MessageQueues0 = [{couch_file, {CF}}, {couch_db_updater, {CDU}}], MessageQueues = MessageQueues0 ++ message_queues(registered()), {SQ, DCQ} = run_queues(), [ diff --git a/src/couch/src/couch_server.erl b/src/couch/src/couch_server.erl index 4d1a96b19..22797f80b 100644 --- a/src/couch/src/couch_server.erl +++ b/src/couch/src/couch_server.erl @@ -28,7 +28,6 @@ -export([lock/2, unlock/1]). -export([db_updated/1]). -export([num_servers/0, couch_server/1, couch_dbs_pid_to_name/1, couch_dbs/1]). --export([aggregate_queue_len/0]). % config_listener api -export([handle_config_change/5, handle_config_terminate/3]). @@ -356,6 +355,7 @@ handle_config_terminate(_, stop, _) -> handle_config_terminate(_Server, _Reason, N) -> erlang:send_after(?RELISTEN_DELAY, whereis(?MODULE), {restart_config_listener, N}). + all_databases() -> {ok, DbList} = all_databases( fun(DbName, Acc) -> {ok, [DbName | Acc]} end, []), @@ -937,14 +937,6 @@ num_servers() -> erlang:system_info(schedulers). -aggregate_queue_len() -> - N = num_servers(), - Names = [couch_server(I) || I <- lists:seq(1, N)], - MQs = [process_info(whereis(Name), message_queue_len) || - Name <- Names], - lists:sum([X || {_, X} <- MQs]). - - -ifdef(TEST). -include_lib("eunit/include/eunit.hrl"). |