couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r950526 - /couchdb/branches/0.11.x/src/couchdb/couch_view.erl
Date Wed, 02 Jun 2010 12:23:56 GMT
Author: jan
Date: Wed Jun  2 12:23:55 2010
New Revision: 950526

URL: http://svn.apache.org/viewvc?rev=950526&view=rev
Log:
Merge r930364 from trunk:

Fix hang with view shutdown.

Modified:
    couchdb/branches/0.11.x/src/couchdb/couch_view.erl

Modified: couchdb/branches/0.11.x/src/couchdb/couch_view.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_view.erl?rev=950526&r1=950525&r2=950526&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch_view.erl (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch_view.erl Wed Jun  2 12:23:55 2010
@@ -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").



Mime
View raw message