You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/11/09 14:53:08 UTC
[12/47] hbase-site git commit: Published site at
fe2265fa4a1e828b2e68ff8e42639c5942dccb1b.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9592fdb5/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
index 62e604e..0a58fc2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
@@ -348,115 +348,131 @@
<span class="sourceLineNo">340</span> }<a name="line.340"></a>
<span class="sourceLineNo">341</span> WALKey.Builder builder = WALKey.newBuilder();<a name="line.341"></a>
<span class="sourceLineNo">342</span> long size = 0;<a name="line.342"></a>
-<span class="sourceLineNo">343</span> try {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> long available = -1;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> try {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> int firstByte = this.inputStream.read();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> if (firstByte == -1) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> throw new EOFException("First byte is negative at offset " + originalPosition);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span> size = CodedInputStream.readRawVarint32(firstByte, this.inputStream);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> // available may be < 0 on local fs for instance. If so, can't depend on it.<a name="line.351"></a>
-<span class="sourceLineNo">352</span> available = this.inputStream.available();<a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (available > 0 && available < size) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> throw new EOFException("Available stream not enough for edit, " +<a name="line.354"></a>
-<span class="sourceLineNo">355</span> "inputStream.available()= " + this.inputStream.available() + ", " +<a name="line.355"></a>
-<span class="sourceLineNo">356</span> "entry size= " + size + " at offset = " + this.inputStream.getPos());<a name="line.356"></a>
-<span class="sourceLineNo">357</span> }<a name="line.357"></a>
-<span class="sourceLineNo">358</span> ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),<a name="line.358"></a>
-<span class="sourceLineNo">359</span> (int)size);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> } catch (InvalidProtocolBufferException ipbe) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +<a name="line.361"></a>
-<span class="sourceLineNo">362</span> originalPosition + ", currentPosition=" + this.inputStream.getPos() +<a name="line.362"></a>
-<span class="sourceLineNo">363</span> ", messageSize=" + size + ", currentAvailable=" + available).initCause(ipbe);<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> if (!builder.isInitialized()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // TODO: not clear if we should try to recover from corrupt PB that looks semi-legit.<a name="line.366"></a>
-<span class="sourceLineNo">367</span> // If we can get the KV count, we could, theoretically, try to get next record.<a name="line.367"></a>
-<span class="sourceLineNo">368</span> throw new EOFException("Partial PB while reading WAL, " +<a name="line.368"></a>
-<span class="sourceLineNo">369</span> "probably an unexpected EOF, ignoring. current offset=" + this.inputStream.getPos());<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span> WALKey walKey = builder.build();<a name="line.371"></a>
-<span class="sourceLineNo">372</span> entry.getKey().readFieldsFromPb(walKey, this.byteStringUncompressor);<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (!walKey.hasFollowingKvCount() || 0 == walKey.getFollowingKvCount()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> if (LOG.isTraceEnabled()) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span> LOG.trace("WALKey has no KVs that follow it; trying the next one. current offset=" +<a name="line.375"></a>
-<span class="sourceLineNo">376</span> this.inputStream.getPos());<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> continue;<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> int expectedCells = walKey.getFollowingKvCount();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> long posBefore = this.inputStream.getPos();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> try {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> int actualCells = entry.getEdit().readFromCells(cellDecoder, expectedCells);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> if (expectedCells != actualCells) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> throw new EOFException("Only read " + actualCells); // other info added in catch<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span> } catch (Exception ex) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> String posAfterStr = "<unknown>";<a name="line.388"></a>
-<span class="sourceLineNo">389</span> try {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> posAfterStr = this.inputStream.getPos() + "";<a name="line.390"></a>
-<span class="sourceLineNo">391</span> } catch (Throwable t) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> if (LOG.isTraceEnabled()) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> LOG.trace("Error getting pos for error message - ignoring", t);<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span> String message = " while reading " + expectedCells + " WAL KVs; started reading at "<a name="line.396"></a>
-<span class="sourceLineNo">397</span> + posBefore + " and read up to " + posAfterStr;<a name="line.397"></a>
-<span class="sourceLineNo">398</span> IOException realEofEx = extractHiddenEof(ex);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> throw (EOFException) new EOFException("EOF " + message).<a name="line.399"></a>
-<span class="sourceLineNo">400</span> initCause(realEofEx != null ? realEofEx : ex);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> }<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (trailerPresent && this.inputStream.getPos() > this.walEditsStopOffset) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> LOG.error("Read WALTrailer while reading WALEdits. wal: " + this.path<a name="line.403"></a>
-<span class="sourceLineNo">404</span> + ", inputStream.getPos(): " + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.404"></a>
-<span class="sourceLineNo">405</span> + this.walEditsStopOffset);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> throw new EOFException("Read WALTrailer while reading WALEdits");<a name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span> } catch (EOFException eof) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> // If originalPosition is < 0, it is rubbish and we cannot use it (probably local fs)<a name="line.409"></a>
-<span class="sourceLineNo">410</span> if (originalPosition < 0) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> if (LOG.isTraceEnabled()) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> LOG.trace("Encountered a malformed edit, but can't seek back to last good position because originalPosition is negative. last offset=" + this.inputStream.getPos(), eof);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span> throw eof;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> // Else restore our position to original location in hope that next time through we will<a name="line.416"></a>
-<span class="sourceLineNo">417</span> // read successfully.<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (LOG.isTraceEnabled()) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> LOG.trace("Encountered a malformed edit, seeking back to last good position in file, from "+ inputStream.getPos()+" to " + originalPosition, eof);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> seekOnFs(originalPosition);<a name="line.421"></a>
-<span class="sourceLineNo">422</span> return false;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span> return true;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> }<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> private IOException extractHiddenEof(Exception ex) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> // There are two problems we are dealing with here. Hadoop stream throws generic exception<a name="line.429"></a>
-<span class="sourceLineNo">430</span> // for EOF, not EOFException; and scanner further hides it inside RuntimeException.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> IOException ioEx = null;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> if (ex instanceof EOFException) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> return (EOFException)ex;<a name="line.433"></a>
-<span class="sourceLineNo">434</span> } else if (ex instanceof IOException) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> ioEx = (IOException)ex;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> } else if (ex instanceof RuntimeException<a name="line.436"></a>
-<span class="sourceLineNo">437</span> && ex.getCause() != null && ex.getCause() instanceof IOException) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> ioEx = (IOException)ex.getCause();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> if (ioEx != null) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> if (ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return null;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> return null;<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> @Override<a name="line.447"></a>
-<span class="sourceLineNo">448</span> protected void seekOnFs(long pos) throws IOException {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> this.inputStream.seek(pos);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span>}<a name="line.451"></a>
+<span class="sourceLineNo">343</span> boolean resetPosition = false;<a name="line.343"></a>
+<span class="sourceLineNo">344</span> try {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> long available = -1;<a name="line.345"></a>
+<span class="sourceLineNo">346</span> try {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> int firstByte = this.inputStream.read();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (firstByte == -1) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> throw new EOFException("First byte is negative at offset " + originalPosition);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span> size = CodedInputStream.readRawVarint32(firstByte, this.inputStream);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> // available may be < 0 on local fs for instance. If so, can't depend on it.<a name="line.352"></a>
+<span class="sourceLineNo">353</span> available = this.inputStream.available();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> if (available > 0 && available < size) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> throw new EOFException("Available stream not enough for edit, " +<a name="line.355"></a>
+<span class="sourceLineNo">356</span> "inputStream.available()= " + this.inputStream.available() + ", " +<a name="line.356"></a>
+<span class="sourceLineNo">357</span> "entry size= " + size + " at offset = " + this.inputStream.getPos());<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),<a name="line.359"></a>
+<span class="sourceLineNo">360</span> (int)size);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> } catch (InvalidProtocolBufferException ipbe) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> resetPosition = true;<a name="line.362"></a>
+<span class="sourceLineNo">363</span> throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +<a name="line.363"></a>
+<span class="sourceLineNo">364</span> originalPosition + ", currentPosition=" + this.inputStream.getPos() +<a name="line.364"></a>
+<span class="sourceLineNo">365</span> ", messageSize=" + size + ", currentAvailable=" + available).initCause(ipbe);<a name="line.365"></a>
+<span class="sourceLineNo">366</span> }<a name="line.366"></a>
+<span class="sourceLineNo">367</span> if (!builder.isInitialized()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> // TODO: not clear if we should try to recover from corrupt PB that looks semi-legit.<a name="line.368"></a>
+<span class="sourceLineNo">369</span> // If we can get the KV count, we could, theoretically, try to get next record.<a name="line.369"></a>
+<span class="sourceLineNo">370</span> throw new EOFException("Partial PB while reading WAL, " +<a name="line.370"></a>
+<span class="sourceLineNo">371</span> "probably an unexpected EOF, ignoring. current offset=" + this.inputStream.getPos());<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> WALKey walKey = builder.build();<a name="line.373"></a>
+<span class="sourceLineNo">374</span> entry.getKey().readFieldsFromPb(walKey, this.byteStringUncompressor);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> if (!walKey.hasFollowingKvCount() || 0 == walKey.getFollowingKvCount()) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> if (LOG.isTraceEnabled()) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span> LOG.trace("WALKey has no KVs that follow it; trying the next one. current offset=" +<a name="line.377"></a>
+<span class="sourceLineNo">378</span> this.inputStream.getPos());<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span> seekOnFs(originalPosition);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> return false;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span> int expectedCells = walKey.getFollowingKvCount();<a name="line.383"></a>
+<span class="sourceLineNo">384</span> long posBefore = this.inputStream.getPos();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> try {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> int actualCells = entry.getEdit().readFromCells(cellDecoder, expectedCells);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (expectedCells != actualCells) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> resetPosition = true;<a name="line.388"></a>
+<span class="sourceLineNo">389</span> throw new EOFException("Only read " + actualCells); // other info added in catch<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span> } catch (Exception ex) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> String posAfterStr = "<unknown>";<a name="line.392"></a>
+<span class="sourceLineNo">393</span> try {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> posAfterStr = this.inputStream.getPos() + "";<a name="line.394"></a>
+<span class="sourceLineNo">395</span> } catch (Throwable t) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> if (LOG.isTraceEnabled()) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> LOG.trace("Error getting pos for error message - ignoring", t);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> }<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> String message = " while reading " + expectedCells + " WAL KVs; started reading at "<a name="line.400"></a>
+<span class="sourceLineNo">401</span> + posBefore + " and read up to " + posAfterStr;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> IOException realEofEx = extractHiddenEof(ex);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throw (EOFException) new EOFException("EOF " + message).<a name="line.403"></a>
+<span class="sourceLineNo">404</span> initCause(realEofEx != null ? realEofEx : ex);<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (trailerPresent && this.inputStream.getPos() > this.walEditsStopOffset) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> LOG.error("Read WALTrailer while reading WALEdits. wal: " + this.path<a name="line.407"></a>
+<span class="sourceLineNo">408</span> + ", inputStream.getPos(): " + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.408"></a>
+<span class="sourceLineNo">409</span> + this.walEditsStopOffset);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> throw new EOFException("Read WALTrailer while reading WALEdits");<a name="line.410"></a>
+<span class="sourceLineNo">411</span> }<a name="line.411"></a>
+<span class="sourceLineNo">412</span> } catch (EOFException eof) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // If originalPosition is < 0, it is rubbish and we cannot use it (probably local fs)<a name="line.413"></a>
+<span class="sourceLineNo">414</span> if (originalPosition < 0) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (LOG.isTraceEnabled()) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> LOG.trace("Encountered a malformed edit, but can't seek back to last good position "<a name="line.416"></a>
+<span class="sourceLineNo">417</span> + "because originalPosition is negative. last offset="<a name="line.417"></a>
+<span class="sourceLineNo">418</span> + this.inputStream.getPos(), eof);<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> throw eof;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span> // If stuck at the same place and we got and exception, lets go back at the beginning.<a name="line.422"></a>
+<span class="sourceLineNo">423</span> if (inputStream.getPos() == originalPosition && resetPosition) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> if (LOG.isTraceEnabled()) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> LOG.trace("Encountered a malformed edit, seeking to the beginning of the WAL since "<a name="line.425"></a>
+<span class="sourceLineNo">426</span> + "current position and original position match at " + originalPosition);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span> seekOnFs(0);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> } else {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> // Else restore our position to original location in hope that next time through we will<a name="line.430"></a>
+<span class="sourceLineNo">431</span> // read successfully.<a name="line.431"></a>
+<span class="sourceLineNo">432</span> if (LOG.isTraceEnabled()) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> LOG.trace("Encountered a malformed edit, seeking back to last good position in file, "<a name="line.433"></a>
+<span class="sourceLineNo">434</span> + "from " + inputStream.getPos()+" to " + originalPosition, eof);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> seekOnFs(originalPosition);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> }<a name="line.437"></a>
+<span class="sourceLineNo">438</span> return false;<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span> return true;<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> private IOException extractHiddenEof(Exception ex) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span> // There are two problems we are dealing with here. Hadoop stream throws generic exception<a name="line.445"></a>
+<span class="sourceLineNo">446</span> // for EOF, not EOFException; and scanner further hides it inside RuntimeException.<a name="line.446"></a>
+<span class="sourceLineNo">447</span> IOException ioEx = null;<a name="line.447"></a>
+<span class="sourceLineNo">448</span> if (ex instanceof EOFException) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> return (EOFException)ex;<a name="line.449"></a>
+<span class="sourceLineNo">450</span> } else if (ex instanceof IOException) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> ioEx = (IOException)ex;<a name="line.451"></a>
+<span class="sourceLineNo">452</span> } else if (ex instanceof RuntimeException<a name="line.452"></a>
+<span class="sourceLineNo">453</span> && ex.getCause() != null && ex.getCause() instanceof IOException) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> ioEx = (IOException)ex.getCause();<a name="line.454"></a>
+<span class="sourceLineNo">455</span> }<a name="line.455"></a>
+<span class="sourceLineNo">456</span> if (ioEx != null) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> if (ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return null;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return null;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> @Override<a name="line.463"></a>
+<span class="sourceLineNo">464</span> protected void seekOnFs(long pos) throws IOException {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> this.inputStream.seek(pos);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span>}<a name="line.467"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9592fdb5/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
index 62e604e..0a58fc2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
@@ -348,115 +348,131 @@
<span class="sourceLineNo">340</span> }<a name="line.340"></a>
<span class="sourceLineNo">341</span> WALKey.Builder builder = WALKey.newBuilder();<a name="line.341"></a>
<span class="sourceLineNo">342</span> long size = 0;<a name="line.342"></a>
-<span class="sourceLineNo">343</span> try {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> long available = -1;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> try {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> int firstByte = this.inputStream.read();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> if (firstByte == -1) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> throw new EOFException("First byte is negative at offset " + originalPosition);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span> size = CodedInputStream.readRawVarint32(firstByte, this.inputStream);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> // available may be < 0 on local fs for instance. If so, can't depend on it.<a name="line.351"></a>
-<span class="sourceLineNo">352</span> available = this.inputStream.available();<a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (available > 0 && available < size) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> throw new EOFException("Available stream not enough for edit, " +<a name="line.354"></a>
-<span class="sourceLineNo">355</span> "inputStream.available()= " + this.inputStream.available() + ", " +<a name="line.355"></a>
-<span class="sourceLineNo">356</span> "entry size= " + size + " at offset = " + this.inputStream.getPos());<a name="line.356"></a>
-<span class="sourceLineNo">357</span> }<a name="line.357"></a>
-<span class="sourceLineNo">358</span> ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),<a name="line.358"></a>
-<span class="sourceLineNo">359</span> (int)size);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> } catch (InvalidProtocolBufferException ipbe) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +<a name="line.361"></a>
-<span class="sourceLineNo">362</span> originalPosition + ", currentPosition=" + this.inputStream.getPos() +<a name="line.362"></a>
-<span class="sourceLineNo">363</span> ", messageSize=" + size + ", currentAvailable=" + available).initCause(ipbe);<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> if (!builder.isInitialized()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // TODO: not clear if we should try to recover from corrupt PB that looks semi-legit.<a name="line.366"></a>
-<span class="sourceLineNo">367</span> // If we can get the KV count, we could, theoretically, try to get next record.<a name="line.367"></a>
-<span class="sourceLineNo">368</span> throw new EOFException("Partial PB while reading WAL, " +<a name="line.368"></a>
-<span class="sourceLineNo">369</span> "probably an unexpected EOF, ignoring. current offset=" + this.inputStream.getPos());<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span> WALKey walKey = builder.build();<a name="line.371"></a>
-<span class="sourceLineNo">372</span> entry.getKey().readFieldsFromPb(walKey, this.byteStringUncompressor);<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (!walKey.hasFollowingKvCount() || 0 == walKey.getFollowingKvCount()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> if (LOG.isTraceEnabled()) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span> LOG.trace("WALKey has no KVs that follow it; trying the next one. current offset=" +<a name="line.375"></a>
-<span class="sourceLineNo">376</span> this.inputStream.getPos());<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> continue;<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> int expectedCells = walKey.getFollowingKvCount();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> long posBefore = this.inputStream.getPos();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> try {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> int actualCells = entry.getEdit().readFromCells(cellDecoder, expectedCells);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> if (expectedCells != actualCells) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> throw new EOFException("Only read " + actualCells); // other info added in catch<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span> } catch (Exception ex) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> String posAfterStr = "<unknown>";<a name="line.388"></a>
-<span class="sourceLineNo">389</span> try {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> posAfterStr = this.inputStream.getPos() + "";<a name="line.390"></a>
-<span class="sourceLineNo">391</span> } catch (Throwable t) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> if (LOG.isTraceEnabled()) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> LOG.trace("Error getting pos for error message - ignoring", t);<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span> String message = " while reading " + expectedCells + " WAL KVs; started reading at "<a name="line.396"></a>
-<span class="sourceLineNo">397</span> + posBefore + " and read up to " + posAfterStr;<a name="line.397"></a>
-<span class="sourceLineNo">398</span> IOException realEofEx = extractHiddenEof(ex);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> throw (EOFException) new EOFException("EOF " + message).<a name="line.399"></a>
-<span class="sourceLineNo">400</span> initCause(realEofEx != null ? realEofEx : ex);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> }<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (trailerPresent && this.inputStream.getPos() > this.walEditsStopOffset) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> LOG.error("Read WALTrailer while reading WALEdits. wal: " + this.path<a name="line.403"></a>
-<span class="sourceLineNo">404</span> + ", inputStream.getPos(): " + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.404"></a>
-<span class="sourceLineNo">405</span> + this.walEditsStopOffset);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> throw new EOFException("Read WALTrailer while reading WALEdits");<a name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span> } catch (EOFException eof) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> // If originalPosition is < 0, it is rubbish and we cannot use it (probably local fs)<a name="line.409"></a>
-<span class="sourceLineNo">410</span> if (originalPosition < 0) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> if (LOG.isTraceEnabled()) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> LOG.trace("Encountered a malformed edit, but can't seek back to last good position because originalPosition is negative. last offset=" + this.inputStream.getPos(), eof);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span> throw eof;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> // Else restore our position to original location in hope that next time through we will<a name="line.416"></a>
-<span class="sourceLineNo">417</span> // read successfully.<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (LOG.isTraceEnabled()) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> LOG.trace("Encountered a malformed edit, seeking back to last good position in file, from "+ inputStream.getPos()+" to " + originalPosition, eof);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> seekOnFs(originalPosition);<a name="line.421"></a>
-<span class="sourceLineNo">422</span> return false;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span> return true;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> }<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> private IOException extractHiddenEof(Exception ex) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> // There are two problems we are dealing with here. Hadoop stream throws generic exception<a name="line.429"></a>
-<span class="sourceLineNo">430</span> // for EOF, not EOFException; and scanner further hides it inside RuntimeException.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> IOException ioEx = null;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> if (ex instanceof EOFException) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> return (EOFException)ex;<a name="line.433"></a>
-<span class="sourceLineNo">434</span> } else if (ex instanceof IOException) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> ioEx = (IOException)ex;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> } else if (ex instanceof RuntimeException<a name="line.436"></a>
-<span class="sourceLineNo">437</span> && ex.getCause() != null && ex.getCause() instanceof IOException) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> ioEx = (IOException)ex.getCause();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> if (ioEx != null) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> if (ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return null;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> return null;<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> @Override<a name="line.447"></a>
-<span class="sourceLineNo">448</span> protected void seekOnFs(long pos) throws IOException {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> this.inputStream.seek(pos);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span>}<a name="line.451"></a>
+<span class="sourceLineNo">343</span> boolean resetPosition = false;<a name="line.343"></a>
+<span class="sourceLineNo">344</span> try {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> long available = -1;<a name="line.345"></a>
+<span class="sourceLineNo">346</span> try {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> int firstByte = this.inputStream.read();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (firstByte == -1) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> throw new EOFException("First byte is negative at offset " + originalPosition);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span> size = CodedInputStream.readRawVarint32(firstByte, this.inputStream);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> // available may be < 0 on local fs for instance. If so, can't depend on it.<a name="line.352"></a>
+<span class="sourceLineNo">353</span> available = this.inputStream.available();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> if (available > 0 && available < size) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> throw new EOFException("Available stream not enough for edit, " +<a name="line.355"></a>
+<span class="sourceLineNo">356</span> "inputStream.available()= " + this.inputStream.available() + ", " +<a name="line.356"></a>
+<span class="sourceLineNo">357</span> "entry size= " + size + " at offset = " + this.inputStream.getPos());<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),<a name="line.359"></a>
+<span class="sourceLineNo">360</span> (int)size);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> } catch (InvalidProtocolBufferException ipbe) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> resetPosition = true;<a name="line.362"></a>
+<span class="sourceLineNo">363</span> throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +<a name="line.363"></a>
+<span class="sourceLineNo">364</span> originalPosition + ", currentPosition=" + this.inputStream.getPos() +<a name="line.364"></a>
+<span class="sourceLineNo">365</span> ", messageSize=" + size + ", currentAvailable=" + available).initCause(ipbe);<a name="line.365"></a>
+<span class="sourceLineNo">366</span> }<a name="line.366"></a>
+<span class="sourceLineNo">367</span> if (!builder.isInitialized()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> // TODO: not clear if we should try to recover from corrupt PB that looks semi-legit.<a name="line.368"></a>
+<span class="sourceLineNo">369</span> // If we can get the KV count, we could, theoretically, try to get next record.<a name="line.369"></a>
+<span class="sourceLineNo">370</span> throw new EOFException("Partial PB while reading WAL, " +<a name="line.370"></a>
+<span class="sourceLineNo">371</span> "probably an unexpected EOF, ignoring. current offset=" + this.inputStream.getPos());<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> WALKey walKey = builder.build();<a name="line.373"></a>
+<span class="sourceLineNo">374</span> entry.getKey().readFieldsFromPb(walKey, this.byteStringUncompressor);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> if (!walKey.hasFollowingKvCount() || 0 == walKey.getFollowingKvCount()) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> if (LOG.isTraceEnabled()) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span> LOG.trace("WALKey has no KVs that follow it; trying the next one. current offset=" +<a name="line.377"></a>
+<span class="sourceLineNo">378</span> this.inputStream.getPos());<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span> seekOnFs(originalPosition);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> return false;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span> int expectedCells = walKey.getFollowingKvCount();<a name="line.383"></a>
+<span class="sourceLineNo">384</span> long posBefore = this.inputStream.getPos();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> try {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> int actualCells = entry.getEdit().readFromCells(cellDecoder, expectedCells);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (expectedCells != actualCells) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> resetPosition = true;<a name="line.388"></a>
+<span class="sourceLineNo">389</span> throw new EOFException("Only read " + actualCells); // other info added in catch<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span> } catch (Exception ex) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> String posAfterStr = "<unknown>";<a name="line.392"></a>
+<span class="sourceLineNo">393</span> try {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> posAfterStr = this.inputStream.getPos() + "";<a name="line.394"></a>
+<span class="sourceLineNo">395</span> } catch (Throwable t) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> if (LOG.isTraceEnabled()) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> LOG.trace("Error getting pos for error message - ignoring", t);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> }<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> String message = " while reading " + expectedCells + " WAL KVs; started reading at "<a name="line.400"></a>
+<span class="sourceLineNo">401</span> + posBefore + " and read up to " + posAfterStr;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> IOException realEofEx = extractHiddenEof(ex);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throw (EOFException) new EOFException("EOF " + message).<a name="line.403"></a>
+<span class="sourceLineNo">404</span> initCause(realEofEx != null ? realEofEx : ex);<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (trailerPresent && this.inputStream.getPos() > this.walEditsStopOffset) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> LOG.error("Read WALTrailer while reading WALEdits. wal: " + this.path<a name="line.407"></a>
+<span class="sourceLineNo">408</span> + ", inputStream.getPos(): " + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.408"></a>
+<span class="sourceLineNo">409</span> + this.walEditsStopOffset);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> throw new EOFException("Read WALTrailer while reading WALEdits");<a name="line.410"></a>
+<span class="sourceLineNo">411</span> }<a name="line.411"></a>
+<span class="sourceLineNo">412</span> } catch (EOFException eof) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // If originalPosition is < 0, it is rubbish and we cannot use it (probably local fs)<a name="line.413"></a>
+<span class="sourceLineNo">414</span> if (originalPosition < 0) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (LOG.isTraceEnabled()) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> LOG.trace("Encountered a malformed edit, but can't seek back to last good position "<a name="line.416"></a>
+<span class="sourceLineNo">417</span> + "because originalPosition is negative. last offset="<a name="line.417"></a>
+<span class="sourceLineNo">418</span> + this.inputStream.getPos(), eof);<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> throw eof;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span> // If stuck at the same place and we got and exception, lets go back at the beginning.<a name="line.422"></a>
+<span class="sourceLineNo">423</span> if (inputStream.getPos() == originalPosition && resetPosition) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> if (LOG.isTraceEnabled()) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> LOG.trace("Encountered a malformed edit, seeking to the beginning of the WAL since "<a name="line.425"></a>
+<span class="sourceLineNo">426</span> + "current position and original position match at " + originalPosition);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span> seekOnFs(0);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> } else {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> // Else restore our position to original location in hope that next time through we will<a name="line.430"></a>
+<span class="sourceLineNo">431</span> // read successfully.<a name="line.431"></a>
+<span class="sourceLineNo">432</span> if (LOG.isTraceEnabled()) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> LOG.trace("Encountered a malformed edit, seeking back to last good position in file, "<a name="line.433"></a>
+<span class="sourceLineNo">434</span> + "from " + inputStream.getPos()+" to " + originalPosition, eof);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> seekOnFs(originalPosition);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> }<a name="line.437"></a>
+<span class="sourceLineNo">438</span> return false;<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span> return true;<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> private IOException extractHiddenEof(Exception ex) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span> // There are two problems we are dealing with here. Hadoop stream throws generic exception<a name="line.445"></a>
+<span class="sourceLineNo">446</span> // for EOF, not EOFException; and scanner further hides it inside RuntimeException.<a name="line.446"></a>
+<span class="sourceLineNo">447</span> IOException ioEx = null;<a name="line.447"></a>
+<span class="sourceLineNo">448</span> if (ex instanceof EOFException) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> return (EOFException)ex;<a name="line.449"></a>
+<span class="sourceLineNo">450</span> } else if (ex instanceof IOException) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> ioEx = (IOException)ex;<a name="line.451"></a>
+<span class="sourceLineNo">452</span> } else if (ex instanceof RuntimeException<a name="line.452"></a>
+<span class="sourceLineNo">453</span> && ex.getCause() != null && ex.getCause() instanceof IOException) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> ioEx = (IOException)ex.getCause();<a name="line.454"></a>
+<span class="sourceLineNo">455</span> }<a name="line.455"></a>
+<span class="sourceLineNo">456</span> if (ioEx != null) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> if (ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return null;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return null;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> @Override<a name="line.463"></a>
+<span class="sourceLineNo">464</span> protected void seekOnFs(long pos) throws IOException {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> this.inputStream.seek(pos);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span>}<a name="line.467"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9592fdb5/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
index 62e604e..0a58fc2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
@@ -348,115 +348,131 @@
<span class="sourceLineNo">340</span> }<a name="line.340"></a>
<span class="sourceLineNo">341</span> WALKey.Builder builder = WALKey.newBuilder();<a name="line.341"></a>
<span class="sourceLineNo">342</span> long size = 0;<a name="line.342"></a>
-<span class="sourceLineNo">343</span> try {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> long available = -1;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> try {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> int firstByte = this.inputStream.read();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> if (firstByte == -1) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> throw new EOFException("First byte is negative at offset " + originalPosition);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span> size = CodedInputStream.readRawVarint32(firstByte, this.inputStream);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> // available may be < 0 on local fs for instance. If so, can't depend on it.<a name="line.351"></a>
-<span class="sourceLineNo">352</span> available = this.inputStream.available();<a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (available > 0 && available < size) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> throw new EOFException("Available stream not enough for edit, " +<a name="line.354"></a>
-<span class="sourceLineNo">355</span> "inputStream.available()= " + this.inputStream.available() + ", " +<a name="line.355"></a>
-<span class="sourceLineNo">356</span> "entry size= " + size + " at offset = " + this.inputStream.getPos());<a name="line.356"></a>
-<span class="sourceLineNo">357</span> }<a name="line.357"></a>
-<span class="sourceLineNo">358</span> ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),<a name="line.358"></a>
-<span class="sourceLineNo">359</span> (int)size);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> } catch (InvalidProtocolBufferException ipbe) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +<a name="line.361"></a>
-<span class="sourceLineNo">362</span> originalPosition + ", currentPosition=" + this.inputStream.getPos() +<a name="line.362"></a>
-<span class="sourceLineNo">363</span> ", messageSize=" + size + ", currentAvailable=" + available).initCause(ipbe);<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> if (!builder.isInitialized()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // TODO: not clear if we should try to recover from corrupt PB that looks semi-legit.<a name="line.366"></a>
-<span class="sourceLineNo">367</span> // If we can get the KV count, we could, theoretically, try to get next record.<a name="line.367"></a>
-<span class="sourceLineNo">368</span> throw new EOFException("Partial PB while reading WAL, " +<a name="line.368"></a>
-<span class="sourceLineNo">369</span> "probably an unexpected EOF, ignoring. current offset=" + this.inputStream.getPos());<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span> WALKey walKey = builder.build();<a name="line.371"></a>
-<span class="sourceLineNo">372</span> entry.getKey().readFieldsFromPb(walKey, this.byteStringUncompressor);<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (!walKey.hasFollowingKvCount() || 0 == walKey.getFollowingKvCount()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> if (LOG.isTraceEnabled()) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span> LOG.trace("WALKey has no KVs that follow it; trying the next one. current offset=" +<a name="line.375"></a>
-<span class="sourceLineNo">376</span> this.inputStream.getPos());<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> continue;<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> int expectedCells = walKey.getFollowingKvCount();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> long posBefore = this.inputStream.getPos();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> try {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> int actualCells = entry.getEdit().readFromCells(cellDecoder, expectedCells);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> if (expectedCells != actualCells) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> throw new EOFException("Only read " + actualCells); // other info added in catch<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span> } catch (Exception ex) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> String posAfterStr = "<unknown>";<a name="line.388"></a>
-<span class="sourceLineNo">389</span> try {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> posAfterStr = this.inputStream.getPos() + "";<a name="line.390"></a>
-<span class="sourceLineNo">391</span> } catch (Throwable t) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> if (LOG.isTraceEnabled()) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> LOG.trace("Error getting pos for error message - ignoring", t);<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span> String message = " while reading " + expectedCells + " WAL KVs; started reading at "<a name="line.396"></a>
-<span class="sourceLineNo">397</span> + posBefore + " and read up to " + posAfterStr;<a name="line.397"></a>
-<span class="sourceLineNo">398</span> IOException realEofEx = extractHiddenEof(ex);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> throw (EOFException) new EOFException("EOF " + message).<a name="line.399"></a>
-<span class="sourceLineNo">400</span> initCause(realEofEx != null ? realEofEx : ex);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> }<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (trailerPresent && this.inputStream.getPos() > this.walEditsStopOffset) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> LOG.error("Read WALTrailer while reading WALEdits. wal: " + this.path<a name="line.403"></a>
-<span class="sourceLineNo">404</span> + ", inputStream.getPos(): " + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.404"></a>
-<span class="sourceLineNo">405</span> + this.walEditsStopOffset);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> throw new EOFException("Read WALTrailer while reading WALEdits");<a name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span> } catch (EOFException eof) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> // If originalPosition is < 0, it is rubbish and we cannot use it (probably local fs)<a name="line.409"></a>
-<span class="sourceLineNo">410</span> if (originalPosition < 0) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> if (LOG.isTraceEnabled()) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> LOG.trace("Encountered a malformed edit, but can't seek back to last good position because originalPosition is negative. last offset=" + this.inputStream.getPos(), eof);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span> throw eof;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> // Else restore our position to original location in hope that next time through we will<a name="line.416"></a>
-<span class="sourceLineNo">417</span> // read successfully.<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (LOG.isTraceEnabled()) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> LOG.trace("Encountered a malformed edit, seeking back to last good position in file, from "+ inputStream.getPos()+" to " + originalPosition, eof);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> seekOnFs(originalPosition);<a name="line.421"></a>
-<span class="sourceLineNo">422</span> return false;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span> return true;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> }<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> private IOException extractHiddenEof(Exception ex) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> // There are two problems we are dealing with here. Hadoop stream throws generic exception<a name="line.429"></a>
-<span class="sourceLineNo">430</span> // for EOF, not EOFException; and scanner further hides it inside RuntimeException.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> IOException ioEx = null;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> if (ex instanceof EOFException) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> return (EOFException)ex;<a name="line.433"></a>
-<span class="sourceLineNo">434</span> } else if (ex instanceof IOException) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> ioEx = (IOException)ex;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> } else if (ex instanceof RuntimeException<a name="line.436"></a>
-<span class="sourceLineNo">437</span> && ex.getCause() != null && ex.getCause() instanceof IOException) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> ioEx = (IOException)ex.getCause();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> if (ioEx != null) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> if (ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return null;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> return null;<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> @Override<a name="line.447"></a>
-<span class="sourceLineNo">448</span> protected void seekOnFs(long pos) throws IOException {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> this.inputStream.seek(pos);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span>}<a name="line.451"></a>
+<span class="sourceLineNo">343</span> boolean resetPosition = false;<a name="line.343"></a>
+<span class="sourceLineNo">344</span> try {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> long available = -1;<a name="line.345"></a>
+<span class="sourceLineNo">346</span> try {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> int firstByte = this.inputStream.read();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (firstByte == -1) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> throw new EOFException("First byte is negative at offset " + originalPosition);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span> size = CodedInputStream.readRawVarint32(firstByte, this.inputStream);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> // available may be < 0 on local fs for instance. If so, can't depend on it.<a name="line.352"></a>
+<span class="sourceLineNo">353</span> available = this.inputStream.available();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> if (available > 0 && available < size) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> throw new EOFException("Available stream not enough for edit, " +<a name="line.355"></a>
+<span class="sourceLineNo">356</span> "inputStream.available()= " + this.inputStream.available() + ", " +<a name="line.356"></a>
+<span class="sourceLineNo">357</span> "entry size= " + size + " at offset = " + this.inputStream.getPos());<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),<a name="line.359"></a>
+<span class="sourceLineNo">360</span> (int)size);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> } catch (InvalidProtocolBufferException ipbe) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> resetPosition = true;<a name="line.362"></a>
+<span class="sourceLineNo">363</span> throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +<a name="line.363"></a>
+<span class="sourceLineNo">364</span> originalPosition + ", currentPosition=" + this.inputStream.getPos() +<a name="line.364"></a>
+<span class="sourceLineNo">365</span> ", messageSize=" + size + ", currentAvailable=" + available).initCause(ipbe);<a name="line.365"></a>
+<span class="sourceLineNo">366</span> }<a name="line.366"></a>
+<span class="sourceLineNo">367</span> if (!builder.isInitialized()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> // TODO: not clear if we should try to recover from corrupt PB that looks semi-legit.<a name="line.368"></a>
+<span class="sourceLineNo">369</span> // If we can get the KV count, we could, theoretically, try to get next record.<a name="line.369"></a>
+<span class="sourceLineNo">370</span> throw new EOFException("Partial PB while reading WAL, " +<a name="line.370"></a>
+<span class="sourceLineNo">371</span> "probably an unexpected EOF, ignoring. current offset=" + this.inputStream.getPos());<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> WALKey walKey = builder.build();<a name="line.373"></a>
+<span class="sourceLineNo">374</span> entry.getKey().readFieldsFromPb(walKey, this.byteStringUncompressor);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> if (!walKey.hasFollowingKvCount() || 0 == walKey.getFollowingKvCount()) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> if (LOG.isTraceEnabled()) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span> LOG.trace("WALKey has no KVs that follow it; trying the next one. current offset=" +<a name="line.377"></a>
+<span class="sourceLineNo">378</span> this.inputStream.getPos());<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span> seekOnFs(originalPosition);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> return false;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span> int expectedCells = walKey.getFollowingKvCount();<a name="line.383"></a>
+<span class="sourceLineNo">384</span> long posBefore = this.inputStream.getPos();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> try {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> int actualCells = entry.getEdit().readFromCells(cellDecoder, expectedCells);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (expectedCells != actualCells) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> resetPosition = true;<a name="line.388"></a>
+<span class="sourceLineNo">389</span> throw new EOFException("Only read " + actualCells); // other info added in catch<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span> } catch (Exception ex) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> String posAfterStr = "<unknown>";<a name="line.392"></a>
+<span class="sourceLineNo">393</span> try {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> posAfterStr = this.inputStream.getPos() + "";<a name="line.394"></a>
+<span class="sourceLineNo">395</span> } catch (Throwable t) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> if (LOG.isTraceEnabled()) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> LOG.trace("Error getting pos for error message - ignoring", t);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> }<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> String message = " while reading " + expectedCells + " WAL KVs; started reading at "<a name="line.400"></a>
+<span class="sourceLineNo">401</span> + posBefore + " and read up to " + posAfterStr;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> IOException realEofEx = extractHiddenEof(ex);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throw (EOFException) new EOFException("EOF " + message).<a name="line.403"></a>
+<span class="sourceLineNo">404</span> initCause(realEofEx != null ? realEofEx : ex);<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (trailerPresent && this.inputStream.getPos() > this.walEditsStopOffset) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> LOG.error("Read WALTrailer while reading WALEdits. wal: " + this.path<a name="line.407"></a>
+<span class="sourceLineNo">408</span> + ", inputStream.getPos(): " + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.408"></a>
+<span class="sourceLineNo">409</span> + this.walEditsStopOffset);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> throw new EOFException("Read WALTrailer while reading WALEdits");<a name="line.410"></a>
+<span class="sourceLineNo">411</span> }<a name="line.411"></a>
+<span class="sourceLineNo">412</span> } catch (EOFException eof) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // If originalPosition is < 0, it is rubbish and we cannot use it (probably local fs)<a name="line.413"></a>
+<span class="sourceLineNo">414</span> if (originalPosition < 0) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (LOG.isTraceEnabled()) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> LOG.trace("Encountered a malformed edit, but can't seek back to last good position "<a name="line.416"></a>
+<span class="sourceLineNo">417</span> + "because originalPosition is negative. last offset="<a name="line.417"></a>
+<span class="sourceLineNo">418</span> + this.inputStream.getPos(), eof);<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> throw eof;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span> // If stuck at the same place and we got and exception, lets go back at the beginning.<a name="line.422"></a>
+<span class="sourceLineNo">423</span> if (inputStream.getPos() == originalPosition && resetPosition) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> if (LOG.isTraceEnabled()) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> LOG.trace("Encountered a malformed edit, seeking to the beginning of the WAL since "<a name="line.425"></a>
+<span class="sourceLineNo">426</span> + "current position and original position match at " + originalPosition);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span> seekOnFs(0);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> } else {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> // Else restore our position to original location in hope that next time through we will<a name="line.430"></a>
+<span class="sourceLineNo">431</span> // read successfully.<a name="line.431"></a>
+<span class="sourceLineNo">432</span> if (LOG.isTraceEnabled()) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> LOG.trace("Encountered a malformed edit, seeking back to last good position in file, "<a name="line.433"></a>
+<span class="sourceLineNo">434</span> + "from " + inputStream.getPos()+" to " + originalPosition, eof);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> seekOnFs(originalPosition);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> }<a name="line.437"></a>
+<span class="sourceLineNo">438</span> return false;<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span> return true;<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> private IOException extractHiddenEof(Exception ex) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span> // There are two problems we are dealing with here. Hadoop stream throws generic exception<a name="line.445"></a>
+<span class="sourceLineNo">446</span> // for EOF, not EOFException; and scanner further hides it inside RuntimeException.<a name="line.446"></a>
+<span class="sourceLineNo">447</span> IOException ioEx = null;<a name="line.447"></a>
+<span class="sourceLineNo">448</span> if (ex instanceof EOFException) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> return (EOFException)ex;<a name="line.449"></a>
+<span class="sourceLineNo">450</span> } else if (ex instanceof IOException) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> ioEx = (IOException)ex;<a name="line.451"></a>
+<span class="sourceLineNo">452</span> } else if (ex instanceof RuntimeException<a name="line.452"></a>
+<span class="sourceLineNo">453</span> && ex.getCause() != null && ex.getCause() instanceof IOException) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> ioEx = (IOException)ex.getCause();<a name="line.454"></a>
+<span class="sourceLineNo">455</span> }<a name="line.455"></a>
+<span class="sourceLineNo">456</span> if (ioEx != null) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> if (ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return null;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return null;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> @Override<a name="line.463"></a>
+<span class="sourceLineNo">464</span> protected void seekOnFs(long pos) throws IOException {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> this.inputStream.seek(pos);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span>}<a name="line.467"></a>