summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2009-03-16 21:26:47 +0000
committerDamien F. Katz <damien@apache.org>2009-03-16 21:26:47 +0000
commit1d0823556e3dd1e344b0e65743067aafa0899a65 (patch)
tree482ad15a0f8f1993b066aae1d47fb6a86f92b52c /src
parent41841a800df5922133648d82a9f5dd5ec2562b42 (diff)
Fix for occasional replication failure where replication would complete before before the caller had a chance to request the results. No tests, but this should fix this error that already occurs occasionally: {"error":"normal","reason":"{gen_server,call,[<0.228.0>,get_result,infinity]}"}
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@755009 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_rep.erl22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl
index aa107cdf..02b5c58d 100644
--- a/src/couchdb/couch_rep.erl
+++ b/src/couchdb/couch_rep.erl
@@ -91,7 +91,8 @@ replicate(Source, Target) ->
stats,
enum_pid,
docs_buffer = [],
- listeners = []
+ listeners = [],
+ done = false
}).
@@ -178,7 +179,8 @@ init([RepId, Source, Target]) ->
},
{ok, State}.
-
+handle_call(get_result, From, #state{listeners=L,done=true} = State) ->
+ {stop, normal, State#state{listeners=[From|L]}};
handle_call(get_result, From, #state{listeners=L} = State) ->
{noreply, State#state{listeners=[From|L]}};
@@ -218,7 +220,13 @@ handle_call({replicate_doc, {Id, Revs}}, {Pid,_}, #state{enum_pid=Pid} = State)
handle_call({fin, {LastSeq, RevsCount}}, {Pid,_}, #state{enum_pid=Pid} = State) ->
ets:update_counter(State#state.stats, total_revs, RevsCount),
- {stop, normal, ok, State#state{current_seq=LastSeq}}.
+ case State#state.listeners of
+ [] ->
+ % still waiting for the first listener to sen a request
+ {noreply, State#state{current_seq=LastSeq}};
+ _ ->
+ {stop, normal, ok, State#state{current_seq=LastSeq}}
+ end.
handle_cast({increment_update_seq, Seq}, State) ->
couch_task_status:update("Processed source update #~p", [Seq]),
@@ -270,12 +278,8 @@ terminate(normal, State) ->
ets:delete(Stats),
close_db(Target),
- case Listeners of
- [Original|Rest] ->
- %% reply to original requester
- gen_server:reply(Original, {ok, NewRepHistory});
- Rest -> ok
- end,
+ [Original|Rest] = Listeners,
+ gen_server:reply(Original, {ok, NewRepHistory}),
%% maybe trigger another replication. If this replicator uses a local
%% source Db, changes to that Db since we started will not be included in