Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 81783 invoked from network); 8 Dec 2009 05:17:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Dec 2009 05:17:19 -0000 Received: (qmail 43480 invoked by uid 500); 8 Dec 2009 05:17:19 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 43403 invoked by uid 500); 8 Dec 2009 05:17:18 -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 43393 invoked by uid 99); 8 Dec 2009 05:17:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Dec 2009 05:17:18 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Dec 2009 05:17:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5161523889B8; Tue, 8 Dec 2009 05:16:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r888267 - /couchdb/trunk/src/couchdb/couch_rep.erl Date: Tue, 08 Dec 2009 05:16:56 -0000 To: commits@couchdb.apache.org From: kocolosk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091208051656.5161523889B8@eris.apache.org> Author: kocolosk Date: Tue Dec 8 05:16:55 2009 New Revision: 888267 URL: http://svn.apache.org/viewvc?rev=888267&view=rev Log: release old Fds on replication reboot, shut down child procs in a cleaner order Modified: couchdb/trunk/src/couchdb/couch_rep.erl Modified: couchdb/trunk/src/couchdb/couch_rep.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep.erl?rev=888267&r1=888266&r2=888267&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_rep.erl (original) +++ couchdb/trunk/src/couchdb/couch_rep.erl Tue Dec 8 05:16:55 2009 @@ -553,9 +553,11 @@ reader = Reader, writer = Writer } = State, - Pids = [CF, MR, Reader, Writer], + Pids = [Writer, Reader, MR, CF], [unlink(Pid) || Pid <- Pids], [exit(Pid, shutdown) || Pid <- Pids], + close_db(Target), + close_db(Source), {ok, NewState} = init(State#state.init_args), NewState end.