You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2023/09/16 08:28:42 UTC
[couchdb] branch fix-4705 updated (37c5be622 -> ecde57339)
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a change to branch fix-4705
in repository https://gitbox.apache.org/repos/asf/couchdb.git
discard 37c5be622 Return erlang map for smoosh:status
new ecde57339 Return erlang map for smoosh:status
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (37c5be622)
\
N -- N -- N refs/heads/fix-4705 (ecde57339)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/docs/src/api/server/common.rst | 12 ++++++++++++
1 file changed, 12 insertions(+)
[couchdb] 01/01: Return erlang map for smoosh:status
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch fix-4705
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit ecde57339c3e61c83f578f7feb321ce4ff522744
Author: Ronny Berndt <ro...@apache.org>
AuthorDate: Fri Sep 15 00:56:20 2023 +0200
Return erlang map for smoosh:status
---
src/chttpd/src/chttpd_node.erl | 6 ++++++
src/docs/src/api/server/common.rst | 12 ++++++++++++
src/smoosh/src/smoosh_channel.erl | 14 +++++++-------
src/smoosh/src/smoosh_priority_queue.erl | 19 ++++++++-----------
src/smoosh/src/smoosh_server.erl | 6 +++---
5 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/src/chttpd/src/chttpd_node.erl b/src/chttpd/src/chttpd_node.erl
index 46850fc4e..165b85a42 100644
--- a/src/chttpd/src/chttpd_node.erl
+++ b/src/chttpd/src/chttpd_node.erl
@@ -39,6 +39,12 @@ handle_node_req(#httpd{path_parts = [_, <<"_local">>]} = Req) ->
send_json(Req, 200, {[{name, node()}]});
handle_node_req(#httpd{path_parts = [A, <<"_local">> | Rest]} = Req) ->
handle_node_req(Req#httpd{path_parts = [A, node()] ++ Rest});
+% GET /_node/$node/_smoosh/status
+handle_node_req(#httpd{method = 'GET', path_parts = [_, _Node, <<"_smoosh">>, <<"status">>]} = Req) ->
+ {ok, Status} = smoosh:status(),
+ send_json(Req, 200, Status);
+handle_node_req(#httpd{path_parts = [_, _Node, <<"_smoosh">>, <<"status">>]} = Req) ->
+ send_method_not_allowed(Req, "GET");
% GET /_node/$node/_versions
handle_node_req(#httpd{method = 'GET', path_parts = [_, _Node, <<"_versions">>]} = Req) ->
IcuVer = couch_ejson_compare:get_icu_version(),
diff --git a/src/docs/src/api/server/common.rst b/src/docs/src/api/server/common.rst
index 9e645f649..3e2ca4d12 100644
--- a/src/docs/src/api/server/common.rst
+++ b/src/docs/src/api/server/common.rst
@@ -1902,6 +1902,18 @@ See :ref:`Configuration of Prometheus Endpoint <config/prometheus>` for details.
Accept: text/plain
Host: localhost:17986
+.. _api/server/smoosh/status:
+
+==============================
+``/_node/{node-name}/_smoosh/status``
+==============================
+
+.. http:get:: /_node/{node-name}/_smoosh/status
+ :synopsis: Returns metrics of the CouchDB's auto-compaction daemon
+
+ TODO
+
+
.. _api/server/system:
==============================
diff --git a/src/smoosh/src/smoosh_channel.erl b/src/smoosh/src/smoosh_channel.erl
index 92fd3413b..3cfbcdec6 100644
--- a/src/smoosh/src/smoosh_channel.erl
+++ b/src/smoosh/src/smoosh_channel.erl
@@ -77,10 +77,10 @@ enqueue(ServerRef, Object, Priority) ->
get_status(StatusTab) when is_reference(StatusTab) ->
try ets:lookup(StatusTab, status) of
[{status, Status}] -> Status;
- [] -> []
+ [] -> #{}
catch
error:badarg ->
- []
+ #{}
end.
close(ServerRef) ->
@@ -235,11 +235,11 @@ unpersist(Name) ->
%
set_status(#state{} = State) ->
#state{active = Active, starting = Starting, waiting = Waiting} = State,
- Status = [
- {active, map_size(Active)},
- {starting, map_size(Starting)},
- {waiting, smoosh_priority_queue:info(Waiting)}
- ],
+ Status = #{
+ active => map_size(Active),
+ starting => map_size(Starting),
+ waiting => smoosh_priority_queue:info(Waiting)
+ },
true = ets:insert(State#state.stab, {status, Status}),
State.
diff --git a/src/smoosh/src/smoosh_priority_queue.erl b/src/smoosh/src/smoosh_priority_queue.erl
index b2ef4393d..d95f47120 100644
--- a/src/smoosh/src/smoosh_priority_queue.erl
+++ b/src/smoosh/src/smoosh_priority_queue.erl
@@ -64,17 +64,14 @@ qsize(#priority_queue{tree = Tree}) ->
gb_trees:size(Tree).
info(#priority_queue{tree = Tree} = Q) ->
- [
- {size, qsize(Q)}
- | case gb_trees:is_empty(Tree) of
- true ->
- [];
- false ->
- {{Min, _}, _} = gb_trees:smallest(Tree),
- {{Max, _}, _} = gb_trees:largest(Tree),
- [{min, Min}, {max, Max}]
- end
- ].
+ case gb_trees:is_empty(Tree) of
+ true ->
+ #{size => qsize(Q), min => 0, max => 0};
+ false ->
+ {{Min, _}, _} = gb_trees:smallest(Tree),
+ {{Max, _}, _} = gb_trees:largest(Tree),
+ #{size => qsize(Q), min => Min, max => Max}
+ end.
insert(Key, Priority, Capacity, #priority_queue{tree = Tree, map = Map} = Q) ->
TreeKey = {Priority, make_ref()},
diff --git a/src/smoosh/src/smoosh_server.erl b/src/smoosh/src/smoosh_server.erl
index 10368a549..2bb460076 100644
--- a/src/smoosh/src/smoosh_server.erl
+++ b/src/smoosh/src/smoosh_server.erl
@@ -96,11 +96,11 @@ flush() ->
gen_server:call(?MODULE, flush, infinity).
status() ->
- try ets:foldl(fun get_channel_status/2, [], ?MODULE) of
+ try ets:foldl(fun get_channel_status/2, #{}, ?MODULE) of
Res -> {ok, Res}
catch
error:badarg ->
- {ok, []}
+ {ok, #{}}
end.
enqueue(Object0) ->
@@ -286,7 +286,7 @@ remove_enqueue_ref(Ref, #state{} = State) when is_reference(Ref) ->
get_channel_status(#channel{name = Name, stab = Tab}, Acc) ->
Status = smoosh_channel:get_status(Tab),
- [{Name, Status} | Acc];
+ Acc#{list_to_atom(Name) => Status};
get_channel_status(_, Acc) ->
Acc.