Return-Path: X-Original-To: apmail-asterixdb-notifications-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3B8BA18F58 for ; Thu, 22 Oct 2015 06:39:34 +0000 (UTC) Received: (qmail 64135 invoked by uid 500); 22 Oct 2015 06:39:34 -0000 Delivered-To: apmail-asterixdb-notifications-archive@asterixdb.apache.org Received: (qmail 64105 invoked by uid 500); 22 Oct 2015 06:39:34 -0000 Mailing-List: contact notifications-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 notifications@asterixdb.incubator.apache.org Received: (qmail 64096 invoked by uid 99); 22 Oct 2015 06:39:33 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2015 06:39:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 6F474C6014 for ; Thu, 22 Oct 2015 06:39:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.127 X-Spam-Level: ** X-Spam-Status: No, score=2.127 tagged_above=-999 required=6.31 tests=[MISSING_HEADERS=1.207, SPF_FAIL=0.919, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id iAsp1uCs86II for ; Thu, 22 Oct 2015 06:39:26 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 96BF620750 for ; Thu, 22 Oct 2015 06:39:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id 410EF240C2D; Wed, 21 Oct 2015 23:36:41 -0700 (PDT) Date: Wed, 21 Oct 2015 23:36:41 -0700 From: "Murtadha Hubail (Code Review)" CC: Ian Maxon , Jenkins Reply-To: hubailmor@gmail.com X-Gerrit-MessageType: merged Subject: Change in asterixdb[master]: ASTERIXDB-1045: fix log file reading during recovery X-Gerrit-Change-Id: Ic83ee1dd2d7ba88180c25f4ec6c7aa8d0a5a7162 X-Gerrit-ChangeURL: X-Gerrit-Commit: e1dad1984640517366a7e73e323c9de27b0676f7 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.8.4 Message-Id: <20151022063641.410EF240C2D@unhygienix.ics.uci.edu> Murtadha Hubail has submitted this change and it was merged. Change subject: ASTERIXDB-1045: fix log file reading during recovery ...................................................................... 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 --- M asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Ian Maxon: Looks good to me, approved Jenkins: Verified 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 @@ 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; } -- To view, visit https://asterix-gerrit.ics.uci.edu/465 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic83ee1dd2d7ba88180c25f4ec6c7aa8d0a5a7162 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail