diff options
| author | Nick Vatamaniuc <vatamane@apache.org> | 2020-09-09 15:33:24 -0400 |
|---|---|---|
| committer | Nick Vatamaniuc <nickva@users.noreply.github.com> | 2020-09-09 15:40:46 -0400 |
| commit | a819e45f8a841f7fe0b5ef583a95e7de9c04b172 (patch) | |
| tree | 2c381a740ead1ae459abf22c247f6e88438322d8 | |
| parent | fe7d5215297c1eca389c5580717e11476c3d5a4e (diff) | |
| download | couchdb-a819e45f8a841f7fe0b5ef583a95e7de9c04b172.tar.gz | |
Add node and pid to indexer active tasks output
| -rw-r--r-- | src/couch_views/src/couch_views_util.erl | 4 | ||||
| -rw-r--r-- | src/couch_views/test/couch_views_active_tasks_test.erl | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/couch_views/src/couch_views_util.erl b/src/couch_views/src/couch_views_util.erl index 11bba75bd..6298acf33 100644 --- a/src/couch_views/src/couch_views_util.erl +++ b/src/couch_views/src/couch_views_util.erl @@ -286,7 +286,9 @@ active_tasks_info(ChangesDone, DbName, DDocId, LastSeq, DBSeq) -> <<"changes_done">> => ChangesDone, <<"design_document">> => DDocId, <<"current_version_stamp">> => convert_seq_to_stamp(LastSeq), - <<"db_version_stamp">> => convert_seq_to_stamp(DBSeq) + <<"db_version_stamp">> => convert_seq_to_stamp(DBSeq), + <<"node">> => erlang:atom_to_binary(node(), utf8), + <<"pid">> => list_to_binary(pid_to_list(self())) }. diff --git a/src/couch_views/test/couch_views_active_tasks_test.erl b/src/couch_views/test/couch_views_active_tasks_test.erl index f87e01055..c782ffcbd 100644 --- a/src/couch_views/test/couch_views_active_tasks_test.erl +++ b/src/couch_views/test/couch_views_active_tasks_test.erl @@ -81,6 +81,19 @@ verify_basic_active_tasks({Db, DDoc}) -> {IndexerPid, {changes_done, ChangesDone}} = wait_to_reach_changes(10000), [ActiveTask] = fabric2_active_tasks:get_active_tasks(), ChangesDone1 = maps:get(<<"changes_done">>, ActiveTask), + Type = maps:get(<<"type">>, ActiveTask), + DbName = maps:get(<<"database">>, ActiveTask), + DDocId = maps:get(<<"design_document">>, ActiveTask), + Node = maps:get(<<"node">>, ActiveTask), + PidBin = maps:get(<<"pid">>, ActiveTask), + Pid = erlang:list_to_pid(binary_to_list(PidBin)), + ?assertEqual(<<"indexer">>, Type), + ?assertEqual(fabric2_db:name(Db), DbName), + ?assertEqual(?INDEX_FOO, DDocId), + ?assertEqual(atom_to_binary(node(), utf8), Node), + ?assert(is_pid(Pid)), + ?assert(is_process_alive(Pid)), + ?assertEqual(IndexerPid, Pid), IndexerPid ! continue, % we assume the indexer has run for a bit so it has to > 0 ?assert(ChangesDone1 > 0), |