You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2009/08/25 06:31:22 UTC
svn commit: r807473 - in /couchdb/trunk/src/couchdb:
couch_rep_changes_feed.erl couch_rep_reader.erl
Author: kocolosk
Date: Tue Aug 25 04:31:21 2009
New Revision: 807473
URL: http://svn.apache.org/viewvc?rev=807473&view=rev
Log:
disable gen_server timeouts for internal replication processes
Modified:
couchdb/trunk/src/couchdb/couch_rep_changes_feed.erl
couchdb/trunk/src/couchdb/couch_rep_reader.erl
Modified: couchdb/trunk/src/couchdb/couch_rep_changes_feed.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep_changes_feed.erl?rev=807473&r1=807472&r2=807473&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_rep_changes_feed.erl (original)
+++ couchdb/trunk/src/couchdb/couch_rep_changes_feed.erl Tue Aug 25 04:31:21 2009
@@ -279,7 +279,7 @@
{<<"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).
Modified: couchdb/trunk/src/couchdb/couch_rep_reader.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep_reader.erl?rev=807473&r1=807472&r2=807473&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_rep_reader.erl (original)
+++ couchdb/trunk/src/couchdb/couch_rep_reader.erl Tue Aug 25 04:31:21 2009
@@ -244,18 +244,19 @@
% 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 @@
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).