Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C335F2009F3 for ; Sat, 21 May 2016 08:09:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C1D13160A25; Sat, 21 May 2016 06:09:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 199CB160A2B for ; Sat, 21 May 2016 08:09:26 +0200 (CEST) Received: (qmail 81602 invoked by uid 500); 21 May 2016 06:08:03 -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 81592 invoked by uid 99); 21 May 2016 06:08:03 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 May 2016 06:08:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id DC03A1809DD for ; Sat, 21 May 2016 06:06:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.919 X-Spam-Level: X-Spam-Status: No, score=0.919 tagged_above=-999 required=6.31 tests=[SPF_FAIL=0.919] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id gXwzjDHuX8OD for ; Sat, 21 May 2016 06:06:29 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id A94A35F39C for ; Sat, 21 May 2016 06:06:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id 41645241FB3; Fri, 20 May 2016 23:06:39 -0700 (PDT) Date: Fri, 20 May 2016 23:06:39 -0700 From: "Murtadha Hubail (Code Review)" To: Michael Blow Message-ID: Reply-To: hubailmor@gmail.com X-Gerrit-MessageType: newchange Subject: Change in asterixdb[master]: Fix log file EOF during recovery X-Gerrit-Change-Id: If9adbdaea726dd21d15fc1287362375daf30bf16 X-Gerrit-ChangeURL: X-Gerrit-Commit: d4766b88b185f0494e5aa63ffba33f9ae8e26b7d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.8.4 archived-at: Sat, 21 May 2016 06:09:27 -0000 Murtadha Hubail has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/878 Change subject: Fix log file EOF during recovery ...................................................................... Fix log file EOF during recovery Change-Id: If9adbdaea726dd21d15fc1287362375daf30bf16 --- M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java 2 files changed, 7 insertions(+), 10 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/78/878/1 diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java index be0435a..d5ad038 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java @@ -205,16 +205,13 @@ protected void prepareNextLogFile() { //wait until all log records have been flushed in the current file synchronized (flushLSN) { - while (flushLSN.get() != appendLSN.get()) { - //notification will come from LogBuffer.internalFlush(.) - try { + try { + while (flushLSN.get() != appendLSN.get()) { + //notification will come from LogBuffer.internalFlush(.) flushLSN.wait(); - } catch (InterruptedException e) { - if (LOGGER.isLoggable(Level.SEVERE)) { - LOGGER.severe("Preparing new log file was interrupted"); - } - Thread.currentThread().interrupt(); } + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); } } //move appendLSN and flushLSN to the first LSN of the next log file diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java index 1592aba..148aa7e 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java @@ -142,7 +142,7 @@ private ReturnState waitForFlushOrReturnIfEOF() { synchronized (flushLSN) { - while (readLSN > flushLSN.get()) { + while (readLSN >= flushLSN.get()) { if (isRecoveryMode) { return ReturnState.EOF; } @@ -223,7 +223,7 @@ readLSN = LSN; //wait for the log to be flushed if needed before trying to read it. synchronized (flushLSN) { - while (readLSN > flushLSN.get()) { + while (readLSN >= flushLSN.get()) { try { flushLSN.wait(); } catch (InterruptedException e) { -- To view, visit https://asterix-gerrit.ics.uci.edu/878 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9adbdaea726dd21d15fc1287362375daf30bf16 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail