diff options
| author | John Christopher Anderson <jchris@apache.org> | 2010-03-04 03:10:19 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2010-03-04 03:10:19 +0000 |
| commit | d318717866ffa267781ab482e99a05415e2ac0e4 (patch) | |
| tree | 207409d78eacca8e206deb05b99689ec449722a4 /src/couchdb/couch_view.erl | |
| parent | 3a3a9c1efab1c9fe4cd5ebb6c80da4005eb0806b (diff) | |
reverting damien's latest commit until we can figure out why it's causing failures
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@918834 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_view.erl')
| -rw-r--r-- | src/couchdb/couch_view.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl index 234460ce..cbbbd4ac 100644 --- a/src/couchdb/couch_view.erl +++ b/src/couchdb/couch_view.erl @@ -269,9 +269,8 @@ init([]) -> {ok, #server{root_dir=RootDir}}. -terminate(_Reason, _Srv) -> - [couch_util:shutdown_sync(Pid) || {Pid, _} <- - ets:tab2list(couch_groups_by_updater)], +terminate(Reason, _Srv) -> + couch_util:terminate_linked(Reason), ok. @@ -312,7 +311,10 @@ do_reset_indexes(DbName, Root) -> fun({_DbName, Sig}) -> ?LOG_DEBUG("Killing update process for view group ~s. in database ~s.", [Sig, DbName]), [{_, Pid}] = ets:lookup(group_servers_by_sig, {DbName, Sig}), - couch_util:shutdown_sync(Pid) + exit(Pid, kill), + receive {'EXIT', Pid, _} -> + delete_from_ets(Pid, DbName, Sig) + end end, Names), delete_index_dir(Root, DbName), file:delete(Root ++ "/." ++ ?b2l(DbName) ++ "_temp"). |