Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 72226 invoked from network); 20 Oct 2010 13:46:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Oct 2010 13:46:32 -0000 Received: (qmail 89380 invoked by uid 500); 20 Oct 2010 13:46:32 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 89306 invoked by uid 500); 20 Oct 2010 13:46:31 -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 89299 invoked by uid 99); 20 Oct 2010 13:46:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Oct 2010 13:46:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Wed, 20 Oct 2010 13:46:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8BFB42388A4B; Wed, 20 Oct 2010 13:45:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1025573 - /couchdb/trunk/src/couchdb/couch_rep.erl Date: Wed, 20 Oct 2010 13:45:31 -0000 To: commits@couchdb.apache.org From: kocolosk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101020134531.8BFB42388A4B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kocolosk Date: Wed Oct 20 13:45:31 2010 New Revision: 1025573 URL: http://svn.apache.org/viewvc?rev=1025573&view=rev Log: checkpoints reuse session_id. Patch by tilgovi. COUCHDB-704 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=1025573&r1=1025572&r2=1025573&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_rep.erl (original) +++ couchdb/trunk/src/couchdb/couch_rep.erl Wed Oct 20 13:45:31 2010 @@ -40,6 +40,7 @@ start_seq, history, + session_id, source_log, target_log, rep_starttime, @@ -206,6 +207,7 @@ do_init([RepId, {PostProps} = RepDoc, Us start_seq = StartSeq, history = History, + session_id = couch_uuids:random(), source_log = SourceLog, target_log = TargetLog, rep_starttime = httpd_util:rfc1123_date(), @@ -651,6 +653,7 @@ do_checkpoint(State) -> committed_seq = NewSeqNum, start_seq = StartSeqNum, history = OldHistory, + session_id = SessionId, source_log = SourceLog, target_log = TargetLog, rep_starttime = ReplicationStartTime, @@ -662,7 +665,6 @@ do_checkpoint(State) -> {SrcInstanceStartTime, TgtInstanceStartTime} -> ?LOG_INFO("recording a checkpoint for ~s -> ~s at source update_seq ~p", [dbname(Source), dbname(Target), NewSeqNum]), - SessionId = couch_uuids:random(), NewHistoryEntry = {[ {<<"session_id">>, SessionId}, {<<"start_time">>, list_to_binary(ReplicationStartTime)},