svn commit: r706512 - in /hadoop/zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java

[phunt]

Author: phunt
Date: Mon Oct 20 21:36:28 2008
New Revision: 706512

URL: http://svn.apache.org/viewvc?rev=706512&view=rev
Log:
ZOOKEEPER-199. fix log messages in persistence code

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
    
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=706512&r1=706511&r2=706512&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Mon Oct 20 21:36:28 2008
@@ -35,6 +35,8 @@
 
   BUGFIXES: 
 
+  ZOOKEEPER-199. fix log messages in persistence code (mahadev via phunt)
+
   ZOOKEEPER-197. create checksums for snapshots (mahadev via phunt)
 
   ZOOKEEPER-198. apache license header missing from FollowerSyncRequest.java

Modified: 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java?rev=706512&r1=706511&r2=706512&view=diff
==============================================================================
--- 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
 (original)
+++ 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
 Mon Oct 20 21:36:28 2008
@@ -438,7 +438,7 @@
                 hdr = new TxnHeader();
                 record = SerializeUtils.deserializeTxn(iab, hdr);
             } catch (EOFException e) {
-                LOG.info("EOF excepton " + e);
+                LOG.debug("EOF excepton " + e);
                 inputStream.close();
                 inputStream = null;
                 // thsi means that the file has ended 
@@ -477,4 +477,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java?rev=706512&r1=706511&r2=706512&view=diff
==============================================================================
--- 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java
 (original)
+++ 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java
 Mon Oct 20 21:36:28 2008
@@ -110,8 +110,8 @@
                 //empty logs 
                 return dt.lastProcessedZxid;
             }
-            if (hdr.getZxid() <= highestZxid && highestZxid != 0) {
-                LOG.error(highestZxid + "(higestZxid) >= "
+            if (hdr.getZxid() < highestZxid && highestZxid != 0) {
+                LOG.error(highestZxid + "(higestZxid) > "
                         + hdr.getZxid() + "(next log) for type "
                         + hdr.getType());
             } else {
@@ -243,4 +243,4 @@
         txnLog.rollLog();
     }
     
-}
\ No newline at end of file
+}