[hbase] branch branch-2.3 updated: HBASE-25361 [Flakey Tests] branch-2 TestMetaRegionLocationCache.testStandByMetaLocations (#2736) Addendum; Reset counter so we actually wait in the new loop added by the above.

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.3 by this push:
     new 4d54eba  HBASE-25361 [Flakey Tests] branch-2 TestMetaRegionLocationCache.testStandByMetaLocations (#2736) Addendum; Reset counter so we actually wait in the new loop added by the above.
4d54eba is described below

commit 4d54eba82e570381c39b4354120f74f8ab6c679b
Author: stack <st...@apache.org>
AuthorDate: Sat Dec 5 14:00:18 2020 -0800

    HBASE-25361 [Flakey Tests] branch-2 TestMetaRegionLocationCache.testStandByMetaLocations (#2736)
    Addendum; Reset counter so we actually wait in the new loop added by the
    above.
---
 .../org/apache/hadoop/hbase/client/TestMetaRegionLocationCache.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaRegionLocationCache.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaRegionLocationCache.java
index 83f5a55..276cb56 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaRegionLocationCache.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaRegionLocationCache.java
@@ -97,6 +97,7 @@ public class TestMetaRegionLocationCache {
     ZKWatcher zk = master.getZooKeeper();
     List<String> metaZnodes = zk.getMetaReplicaNodes();
     // Wait till all replicas available.
+    retries = 0;
     while (master.getMetaRegionLocationCache().getMetaRegionLocations().get().size() !=
         metaZnodes.size()) {
       Thread.sleep(1000);
@@ -117,6 +118,7 @@ public class TestMetaRegionLocationCache {
 
   @Test public void testStandByMetaLocations() throws Exception {
     HMaster standBy = TEST_UTIL.getMiniHBaseCluster().startMaster().getMaster();
+    standBy.isInitialized();
     verifyCachedMetaLocations(standBy);
   }