asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mhub...@apache.org
Subject incubator-asterixdb git commit: ASTERIXDB-1045: fix log file reading during recovery
Date Thu, 22 Oct 2015 06:39:50 GMT
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 <imaxon@apache.org>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>


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 <mhubail@uci.edu>
Authored: Wed Oct 21 22:44:03 2015 -0700
Committer: Murtadha Hubail <hubailmor@gmail.com>
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;
             }


Mime
View raw message