Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39F4D11BF4 for ; Tue, 5 Aug 2014 16:47:04 +0000 (UTC) Received: (qmail 97874 invoked by uid 500); 5 Aug 2014 16:47:03 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 97791 invoked by uid 500); 5 Aug 2014 16:47:03 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 97651 invoked by uid 99); 5 Aug 2014 16:47:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 16:47:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CF6D49BFE38; Tue, 5 Aug 2014 16:47:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Tue, 05 Aug 2014 16:47:28 -0000 Message-Id: <6c1f46b7f7b348caa1ce168379149538@git.apache.org> In-Reply-To: <6d294a5a3c8043dc88311df0a41f8da6@git.apache.org> References: <6d294a5a3c8043dc88311df0a41f8da6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Fri Jun 14 19:42:03 2013 -0500 Committer: Robert Newson 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 "