Return-Path: X-Original-To: apmail-asterixdb-commits-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C538518F59 for ; Thu, 22 Oct 2015 06:40:00 +0000 (UTC) Received: (qmail 64242 invoked by uid 500); 22 Oct 2015 06:40:00 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 64209 invoked by uid 500); 22 Oct 2015 06:40:00 -0000 Mailing-List: contact commits-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list commits@asterixdb.incubator.apache.org Received: (qmail 64200 invoked by uid 99); 22 Oct 2015 06:40:00 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2015 06:40:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 1E95C1A20C8 for ; Thu, 22 Oct 2015 06:40:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id b5ieNh5-z56E for ; Thu, 22 Oct 2015 06:39:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id ECFF024A33 for ; Thu, 22 Oct 2015 06:39:50 +0000 (UTC) Received: (qmail 64180 invoked by uid 99); 22 Oct 2015 06:39:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2015 06:39:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 132EFE09D2; Thu, 22 Oct 2015 06:39:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mhubail@apache.org To: commits@asterixdb.incubator.apache.org Message-Id: <7a4435a52211439887c9e0f52c71375b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-asterixdb git commit: ASTERIXDB-1045: fix log file reading during recovery Date: Thu, 22 Oct 2015 06:39:50 +0000 (UTC) Repository: incubator-asterixdb Updated Branches: refs/heads/master 812f69cc4 -> e1dad1984 ASTERIXDB-1045: fix log file reading during recovery Change-Id: Ic83ee1dd2d7ba88180c25f4ec6c7aa8d0a5a7162 Reviewed-on: https://asterix-gerrit.ics.uci.edu/465 Reviewed-by: Ian Maxon Tested-by: Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/e1dad198 Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/e1dad198 Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/e1dad198 Branch: refs/heads/master Commit: e1dad1984640517366a7e73e323c9de27b0676f7 Parents: 812f69c Author: Murtadha Hubail Authored: Wed Oct 21 22:44:03 2015 -0700 Committer: Murtadha Hubail Committed: Wed Oct 21 23:36:41 2015 -0700 ---------------------------------------------------------------------- .../transaction/management/service/logging/LogReader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e1dad198/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java ---------------------------------------------------------------------- diff --git a/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java b/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java index 9900468..e0cddee 100644 --- a/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java +++ b/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java @@ -87,8 +87,8 @@ public class LogReader implements ILogReader { return null; } if (readBuffer.position() == readBuffer.limit()) { - boolean eof = refillLogReadBuffer(); - if (eof && isRecoveryMode && readLSN < flushLSN.get()) { + boolean hasRemaining = refillLogReadBuffer(); + if (!hasRemaining && isRecoveryMode && readLSN < flushLSN.get()) { LOGGER.severe("Transaction log ends before expected. Log files may be missing."); return null; }