You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by si...@apache.org on 2013/07/20 20:24:54 UTC

svn commit: r1505181 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java

Author: sijie
Date: Sat Jul 20 18:24:54 2013
New Revision: 1505181

URL: http://svn.apache.org/r1505181
Log:
BOOKKEEPER-646: BookieShell readjournal command is throwing BufferUnderflowException (Rakesh via sijie)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1505181&r1=1505180&r2=1505181&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Sat Jul 20 18:24:54 2013
@@ -74,6 +74,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-563: Avoid Journal polluting page cache (Robin Dhamankar via sijie)
 
+        BOOKKEEPER-646: BookieShell readjournal command is throwing BufferUnderflowException (Rakesh via sijie)
+
       hedwig-server:
 
         BOOKKEEPER-601: readahead cache size isn't updated correctly (sijie via fpj)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java?rev=1505181&r1=1505180&r2=1505181&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java Sat Jul 20 18:24:54 2013
@@ -948,6 +948,12 @@ public class BookieShell implements Tool
             System.out.println();
             return;
         }
+        if (entryId == Bookie.METAENTRY_ID_FENCE_KEY) {
+            System.out.println("Type:           META");
+            System.out.println("Fenced");
+            System.out.println();
+            return;
+        }
         // process a data entry
         long lastAddConfirmed = recBuff.getLong();
         System.out.println("Type:           DATA");