From commits-return-84708-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Mon Apr 8 07:53:13 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 029D5180627 for ; Mon, 8 Apr 2019 09:53:12 +0200 (CEST) Received: (qmail 43094 invoked by uid 500); 8 Apr 2019 07:26:13 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 42704 invoked by uid 99); 8 Apr 2019 07:26:13 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Apr 2019 07:26:13 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id B0B7580A60; Mon, 8 Apr 2019 07:45:50 +0000 (UTC) Date: Mon, 08 Apr 2019 07:46:00 +0000 To: "commits@hbase.apache.org" Subject: [hbase] 11/14: HBASE-22180 Make TestBlockEvictionFromClient.testBlockRefCountAfterSplits more stable MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: openinx@apache.org In-Reply-To: <155470954977.3963.17980631271439338116@gitbox.apache.org> References: <155470954977.3963.17980631271439338116@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: hbase X-Git-Refname: refs/heads/HBASE-21879 X-Git-Reftype: branch X-Git-Rev: 41c7f25a6021dd292f696df1ccbcd29b55756b1e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190408074550.B0B7580A60@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. openinx pushed a commit to branch HBASE-21879 in repository https://gitbox.apache.org/repos/asf/hbase.git commit 41c7f25a6021dd292f696df1ccbcd29b55756b1e Author: zhangduo AuthorDate: Sat Apr 6 22:23:41 2019 +0800 HBASE-22180 Make TestBlockEvictionFromClient.testBlockRefCountAfterSplits more stable --- .../hbase/client/TestBlockEvictionFromClient.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBlockEvictionFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBlockEvictionFromClient.java index 7f20195..5d852ef 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBlockEvictionFromClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBlockEvictionFromClient.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Optional; @@ -72,6 +71,8 @@ import org.junit.rules.TestName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hbase.thirdparty.com.google.common.collect.Iterables; + @Category({ LargeTests.class, ClientTests.class }) @SuppressWarnings("deprecation") public class TestBlockEvictionFromClient { @@ -577,7 +578,7 @@ public class TestBlockEvictionFromClient { table = TEST_UTIL.createTable(tableName, FAMILIES_1, 1, 1024); // get the block cache and region RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(tableName); - String regionName = locator.getAllRegionLocations().get(0).getRegionInfo().getEncodedName(); + String regionName = locator.getAllRegionLocations().get(0).getRegion().getEncodedName(); HRegion region = TEST_UTIL.getRSForFirstRegionInTable(tableName).getRegion(regionName); HStore store = region.getStores().iterator().next(); @@ -601,19 +602,12 @@ public class TestBlockEvictionFromClient { put.addColumn(FAMILY, QUALIFIER2, data2); table.put(put); region.flush(true); + ServerName rs = Iterables.getOnlyElement(TEST_UTIL.getAdmin().getRegionServers()); + int regionCount = TEST_UTIL.getAdmin().getRegions(rs).size(); LOG.info("About to SPLIT on " + Bytes.toString(ROW1)); TEST_UTIL.getAdmin().split(tableName, ROW1); // Wait for splits - Collection regionServers = TEST_UTIL.getAdmin().getRegionServers(); - Iterator serverItr = regionServers.iterator(); - serverItr.hasNext(); - ServerName rs = serverItr.next(); - List onlineRegions = TEST_UTIL.getAdmin().getRegions(rs); - while (onlineRegions.size() != 2) { - onlineRegions = TEST_UTIL.getAdmin().getRegions(rs); - Thread.sleep(100); - LOG.info("Waiting on SPLIT to complete..."); - } + TEST_UTIL.waitFor(60000, () -> TEST_UTIL.getAdmin().getRegions(rs).size() > regionCount); region.compact(true); Iterator iterator = cache.iterator(); // Though the split had created the HalfStorefileReader - the firstkey and lastkey scanners