HBASE-20036 TestAvoidCellReferencesIntoShippedBlocks timed out (Ram)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7cfb4643 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7cfb4643 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7cfb4643 Branch: refs/heads/HBASE-15151 Commit: 7cfb46432fbdf9b53592be11efc8a7d79d1a9455 Parents: a29b3ca Author: Vasudevan <ramkrishna.s.vasude...@intel.com> Authored: Mon Feb 26 22:07:42 2018 +0530 Committer: Vasudevan <ramkrishna.s.vasude...@intel.com> Committed: Mon Feb 26 22:07:42 2018 +0530 ---------------------------------------------------------------------- ...estAvoidCellReferencesIntoShippedBlocks.java | 30 +++++++++++--------- 1 file changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7cfb4643/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java index 0e12ad6..d22772a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java @@ -400,23 +400,27 @@ public class TestAvoidCellReferencesIntoShippedBlocks { scanner = table.getScanner(s1); int count = Iterables.size(scanner); assertEquals("Count the rows", 2, count); - iterator = cache.iterator(); - List<BlockCacheKey> newCacheList = new ArrayList<>(); - while (iterator.hasNext()) { - CachedBlock next = iterator.next(); - BlockCacheKey cacheKey = new BlockCacheKey(next.getFilename(), next.getOffset()); - newCacheList.add(cacheKey); - } int newBlockRefCount = 0; - for (BlockCacheKey key : cacheList) { - if (newCacheList.contains(key)) { - newBlockRefCount++; + List<BlockCacheKey> newCacheList = new ArrayList<>(); + while (true) { + newBlockRefCount = 0; + newCacheList.clear(); + iterator = cache.iterator(); + while (iterator.hasNext()) { + CachedBlock next = iterator.next(); + BlockCacheKey cacheKey = new BlockCacheKey(next.getFilename(), next.getOffset()); + newCacheList.add(cacheKey); + } + for (BlockCacheKey key : cacheList) { + if (newCacheList.contains(key)) { + newBlockRefCount++; + } + } + if (newBlockRefCount == 6) { + break; } } - - assertEquals("old blocks should still be found ", 6, newBlockRefCount); latch.countDown(); - } catch (IOException e) { } }