allow configurable timeouts for _view and _search

apache · Apr 5, 2023 · 61508c8 · 61508c8
1 parent 31e3f64
commit 61508c8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/dreyfus/src/dreyfus_fabric_search.erl b/src/dreyfus/src/dreyfus_fabric_search.erl
@@ -120,8 +120,8 @@ go(DbName, DDoc, IndexName, QueryArgs, Counters, Bookmark, RingOpts) ->
  #shard.ref,
  fun handle_message/3,
  State,
- infinity,
- 1000 * 60 * 60
+ fabric_util:timeout("search", infinity),
+ fabric_util:timeout("search_permsg", 1000 * 60 * 60)
  )
  of
  {ok, Result} ->

diff --git a/src/fabric/src/fabric_util.erl b/src/fabric/src/fabric_util.erl
@@ -25,7 +25,7 @@
  remove_down_workers/2, remove_down_workers/3,
  doc_id_and_rev/1
 ]).
--export([request_timeout/0, attachments_timeout/0, all_docs_timeout/0, view_timeout/1]).
+-export([request_timeout/0, attachments_timeout/0, all_docs_timeout/0, view_timeout/1, timeout/2]).
 -export([log_timeout/2, remove_done_workers/2]).
 -export([is_users_db/1, is_replicator_db/1]).
 -export([open_cluster_db/1, open_cluster_db/2]).

diff --git a/src/fabric/src/fabric_view_map.erl b/src/fabric/src/fabric_view_map.erl
@@ -106,7 +106,7 @@ go(DbName, Workers, {map, View, _}, Args, Callback, Acc0) ->
  fun handle_message/3,
  State,
  fabric_util:view_timeout(Args),
- 1000 * 60 * 60
+ fabric_util:timeout("view_permsg", 1000 * 60 * 60)
  )
  of
  {ok, NewState} ->

diff --git a/src/fabric/src/fabric_view_reduce.erl b/src/fabric/src/fabric_view_reduce.erl
@@ -105,7 +105,7 @@ go2(DbName, Workers, {red, {_, Lang, View}, _} = VInfo, Args, Callback, Acc0) ->
  fun handle_message/3,
  State,
  fabric_util:view_timeout(Args),
- 1000 * 60 * 60
+ fabric_util:timeout("view_permsg", 1000 * 60 * 60)
  )
  of
  {ok, NewState} ->