Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

COUCHDB-1444 Fix missing_named_view errors

Relying on exit signals we were accidentally replacing view state
incorrectly when an exit signal accidentally spidered between various
processes related to couch_os_processes. This changes the state updates
to be a '$gen_cast' instead.
  • Loading branch information...
commit f5341a7dc65e96b806a958a27c9ccee5ec431162 1 parent bf1eb13
@davisp davisp authored
View
30 src/couch_index/src/couch_index_updater.erl
@@ -15,7 +15,7 @@
%% API
--export([start_link/2, run/2, is_running/1, update/2, restart/2]).
+-export([start_link/2, run/2, is_running/1, update/3, restart/2]).
%% gen_server callbacks
-export([init/1, terminate/2, code_change/3]).
@@ -42,8 +42,8 @@ is_running(Pid) ->
gen_server:call(Pid, is_running).
-update(Mod, State) ->
- update(nil, Mod, State).
+update(Parent, Mod, State) ->
+ update(Parent, nil, Mod, State).
restart(Pid, IdxState) ->
@@ -65,7 +65,8 @@ handle_call({update, _IdxState}, _From, #st{pid=Pid}=State) when is_pid(Pid) ->
handle_call({update, IdxState}, _From, #st{idx=Idx, mod=Mod}=State) ->
Args = [Mod:get(db_name, IdxState), Mod:get(idx_name, IdxState)],
?LOG_INFO("Starting index update for db: ~s idx: ~s", Args),
- Pid = spawn_link(fun() -> update(Idx, Mod, IdxState) end),
+ Self = self(),
+ Pid = spawn_link(fun() -> update(Self, Idx, Mod, IdxState) end),
{reply, ok, State#st{pid=Pid}};
handle_call({restart, IdxState}, _From, #st{idx=Idx, mod=Mod}=State) ->
Args = [Mod:get(db_name, IdxState), Mod:get(idx_name, IdxState)],
@@ -74,7 +75,8 @@ handle_call({restart, IdxState}, _From, #st{idx=Idx, mod=Mod}=State) ->
true -> couch_util:shutdown_sync(State#st.pid);
_ -> ok
end,
- Pid = spawn_link(fun() -> update(Idx, State#st.mod, IdxState) end),
+ Self = self(),
+ Pid = spawn_link(fun() -> update(Self, Idx, State#st.mod, IdxState) end),
{reply, ok, State#st{pid=Pid}};
handle_call(is_running, _From, #st{pid=Pid}=State) when is_pid(Pid) ->
{reply, true, State};
@@ -82,18 +84,20 @@ handle_call(is_running, _From, State) ->
{reply, false, State}.
-handle_cast(_Mesg, State) ->
- {stop, unknown_cast, State}.
-
-
-handle_info({'EXIT', Pid, {updated, IdxState}}, #st{mod=Mod, pid=Pid}=State) ->
+handle_cast({Pid, updated, IdxState}, #st{mod=Mod, pid=Pid}=State) ->
Args = [Mod:get(db_name, IdxState), Mod:get(idx_name, IdxState)],
?LOG_INFO("Index update finished for db: ~s idx: ~s", Args),
ok = gen_server:cast(State#st.idx, {updated, IdxState}),
{noreply, State#st{pid=undefined}};
+handle_cast(_Mesg, State) ->
+ {stop, unknown_cast, State}.
+
+
handle_info({'EXIT', Pid, reset}, #st{idx=Idx, pid=Pid}=State) ->
{ok, NewIdxState} = gen_server:call(State#st.idx, reset),
- Pid2 = spawn_link(fun() -> update(Idx, State#st.mod, NewIdxState) end),
+ Self = self(),
+ Fun = fun() -> update(Self, Idx, State#st.mod, NewIdxState) end,
+ Pid2 = spawn_link(Fun),
{noreply, State#st{pid=Pid2}};
handle_info({'EXIT', Pid, normal}, #st{pid=Pid}=State) ->
{noreply, State#st{pid=undefined}};
@@ -114,7 +118,7 @@ code_change(_OldVsn, State, _Extra) ->
{ok, State}.
-update(Idx, Mod, IdxState) ->
+update(Parent, Idx, Mod, IdxState) ->
DbName = Mod:get(db_name, IdxState),
CurrSeq = Mod:get(update_seq, IdxState),
UpdateOpts = Mod:get(update_options, IdxState),
@@ -181,7 +185,7 @@ update(Idx, Mod, IdxState) ->
end,
{ok, FinalIdxState} = Mod:finish_update(LastIdxSt),
- exit({updated, FinalIdxState})
+ gen_server:cast(Parent, {self(), updated, FinalIdxState})
end).
View
21 src/couch_mrview/src/couch_mrview_compactor.erl
@@ -115,14 +115,25 @@ compact(State) ->
recompact(State) ->
+ Self = self(),
link(State#mrst.fd),
- {_Pid, Ref} = erlang:spawn_monitor(fun() ->
- couch_index_updater:update(couch_mrview_index, State)
+ {Pid, Ref} = erlang:spawn_monitor(fun() ->
+ couch_index_updater:update(Self, couch_mrview_index, State)
end),
+ State2 = wait_for_recompact(Pid, Ref),
+ erlang:demonitor(Ref, [flush]),
+ unlink(State#mrst.fd),
+ {ok, State2}.
+
+
+wait_for_recompact(Pid, Ref) ->
receive
- {'DOWN', Ref, _, _, {updated, State2}} ->
- unlink(State#mrst.fd),
- {ok, State2}
+ {'$gen_cast', {Pid, updated, State}} ->
+ State;
+ {'$gen_cast', {new_state, _}} ->
+ wait_for_recompact(Pid, Ref);
+ {'DOWN', Ref, _, _, Reason} ->
+ erlang:error({couch_mrview_compact_error, Reason})
end.
Please sign in to comment.
Something went wrong with that request. Please try again.