You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/05 18:47:28 UTC

[28/34] couch commit: updated refs/heads/windsor-merge-209 to f2368da

Fix couch_server handling of downed db updaters

The return from ets:lookup/2 is the full object which we need to pattern
match against to get the DbName to remove.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/bc4ec1b3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/bc4ec1b3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/bc4ec1b3

Branch: refs/heads/windsor-merge-209
Commit: bc4ec1b37194fd69ad32f7353828f3bf520cae38
Parents: f1e1638
Author: Paul J. Davis <pa...@gmail.com>
Authored: Fri Jun 14 19:42:03 2013 -0500
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 5 16:22:06 2014 +0100

----------------------------------------------------------------------
 src/couch_server.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/bc4ec1b3/src/couch_server.erl
----------------------------------------------------------------------
diff --git a/src/couch_server.erl b/src/couch_server.erl
index 441290f..2199ce9 100644
--- a/src/couch_server.erl
+++ b/src/couch_server.erl
@@ -502,7 +502,7 @@ handle_info({'EXIT', _Pid, config_change}, Server) ->
     {stop, config_change, Server};
 handle_info({'EXIT', Pid, Reason}, Server) ->
     case ets:lookup(couch_dbs_pid_to_name, Pid) of
-    [DbName] ->
+    [{Pid, DbName}] ->
         [#db{compactor_pid=Froms}=Db] = ets:lookup(couch_dbs, DbName),
         if Reason /= snappy_nif_not_loaded -> ok; true ->
             Msg = io_lib:format("To open the database `~s`, Apache CouchDB "