From 358a7c7f77ea684b8dfe3e6b0d1019cff865539e Mon Sep 17 00:00:00 2001 From: Adam Kocoloski Date: Tue, 25 Aug 2009 04:31:21 +0000 Subject: disable gen_server timeouts for internal replication processes git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@807473 13f79535-47bb-0310-9956-ffa450edef68 --- src/couchdb/couch_rep_changes_feed.erl | 2 +- src/couchdb/couch_rep_reader.erl | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/couchdb/couch_rep_changes_feed.erl b/src/couchdb/couch_rep_changes_feed.erl index 1b6148a5..7ff741e4 100644 --- a/src/couchdb/couch_rep_changes_feed.erl +++ b/src/couchdb/couch_rep_changes_feed.erl @@ -279,7 +279,7 @@ by_seq_loop(Server, Source, StartSeq) -> {<<"id">>, Id}, {<<"changes">>, [{[{<<"rev">>,R}]} || R <- ParsedRevs]} ]}, - gen_server:call(Server, {add_change, Change}), + gen_server:call(Server, {add_change, Change}, infinity), Seq end, 0, Rows), by_seq_loop(Server, Source, EndSeq+1). diff --git a/src/couchdb/couch_rep_reader.erl b/src/couchdb/couch_rep_reader.erl index e647cf87..a7c3fd9f 100644 --- a/src/couchdb/couch_rep_reader.erl +++ b/src/couchdb/couch_rep_reader.erl @@ -244,18 +244,19 @@ reader_loop(ReaderServer, Source, MissingRevsServer) -> % to be safe, make sure Results are sorted by source_seq SortedIdsRevs = lists:keysort(2, IdsRevs), RequestSeqs = [S || {_,S,_} <- SortedIdsRevs], - gen_server:call(ReaderServer, {add_request_seqs, RequestSeqs}), + gen_server:call(ReaderServer, {add_request_seqs, RequestSeqs}, infinity), case Source of #http_db{} -> - [gen_server:call(ReaderServer, {open_remote_doc, Id, Seq, Revs}) - || {Id,Seq,Revs} <- SortedIdsRevs], + [gen_server:call(ReaderServer, {open_remote_doc, Id, Seq, Revs}, + infinity) || {Id,Seq,Revs} <- SortedIdsRevs], reader_loop(ReaderServer, Source, MissingRevsServer); _Local -> Source2 = maybe_reopen_db(Source, HighSeq), lists:foreach(fun({Id,Seq,Revs}) -> {ok, Docs} = couch_db:open_doc_revs(Source2, Id, Revs, [latest]), JustTheDocs = [Doc || {ok, Doc} <- Docs], - gen_server:call(ReaderServer, {add_docs, Seq, JustTheDocs}) + gen_server:call(ReaderServer, {add_docs, Seq, JustTheDocs}, + infinity) end, SortedIdsRevs), reader_loop(ReaderServer, Source2, MissingRevsServer) end @@ -271,6 +272,6 @@ spawn_document_request(Source, Id, Seq, Revs) -> Server = self(), SpawnFun = fun() -> Results = open_doc_revs(Source, Id, Revs), - gen_server:call(Server, {add_docs, Seq, Results}) + gen_server:call(Server, {add_docs, Seq, Results}, infinity) end, spawn_monitor(SpawnFun). -- cgit v1.2.3