summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2010-04-02 20:01:14 +0000
committerDamien F. Katz <damien@apache.org>2010-04-02 20:01:14 +0000
commite59e7bff7b4f14b6e919e72e0b88cb0ce5eec8b6 (patch)
treec56f6328c5dda646b14a2da6f66753161275a68f /src
parentc1ba70c38adef885ee50687210732c3999951a08 (diff)
Fix hang with view shutdown.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@930364 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_view.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl
index 234460ce..f9218e1d 100644
--- a/src/couchdb/couch_view.erl
+++ b/src/couchdb/couch_view.erl
@@ -312,7 +312,8 @@ 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)
+ couch_util:shutdown_sync(Pid),
+ delete_from_ets(Pid, DbName, Sig)
end, Names),
delete_index_dir(Root, DbName),
file:delete(Root ++ "/." ++ ?b2l(DbName) ++ "_temp").