Repository: hbase Updated Branches: refs/heads/branch-1 eb361fc33 -> b30b34abe
HBASE-12123 Failed assertion in BucketCache after 11331 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b30b34ab Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b30b34ab Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b30b34ab Branch: refs/heads/branch-1 Commit: b30b34abe728099e4f95a5df810a63898bd71aec Parents: eb361fc Author: Nick Dimiduk <[email protected]> Authored: Tue Sep 30 15:33:34 2014 -0700 Committer: Nick Dimiduk <[email protected]> Committed: Tue Sep 30 17:28:33 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b30b34ab/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java index 3692c7e..3031c92 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java @@ -1233,11 +1233,13 @@ public class BucketCache implements BlockCache, HeapSize { bucketEntry.setDeserialiserReference(data.getDeserializer(), deserialiserMap); try { if (data instanceof HFileBlock) { - ByteBuffer sliceBuf = ((HFileBlock) data).getBufferReadOnlyWithHeader(); + HFileBlock block = (HFileBlock) data; + ByteBuffer sliceBuf = block.getBufferReadOnlyWithHeader(); sliceBuf.rewind(); - assert len == sliceBuf.limit() + HFileBlock.EXTRA_SERIALIZATION_SPACE; + assert len == sliceBuf.limit() + HFileBlock.EXTRA_SERIALIZATION_SPACE || + len == sliceBuf.limit() + block.headerSize() + HFileBlock.EXTRA_SERIALIZATION_SPACE; ByteBuffer extraInfoBuffer = ByteBuffer.allocate(HFileBlock.EXTRA_SERIALIZATION_SPACE); - ((HFileBlock) data).serializeExtraInfo(extraInfoBuffer); + block.serializeExtraInfo(extraInfoBuffer); ioEngine.write(sliceBuf, offset); ioEngine.write(extraInfoBuffer, offset + len - HFileBlock.EXTRA_SERIALIZATION_SPACE); } else {
