From 8f1466763449aa6c6a02a722e1d146b2117135f4 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Wed, 22 Aug 2018 15:49:40 +0800 Subject: [PATCH] HBASE-21095 The timeout retry logic for several procedures are broken after master restarts --- .../assignment/TestUnexpectedStateException.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java index 0f62f8ed7c..698714bbb5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java @@ -27,14 +27,11 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.RegionInfo; +import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; -import org.apache.hbase.thirdparty.com.google.gson.JsonArray; -import org.apache.hbase.thirdparty.com.google.gson.JsonElement; -import org.apache.hbase.thirdparty.com.google.gson.JsonObject; -import org.apache.hbase.thirdparty.com.google.gson.JsonParser; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -46,6 +43,11 @@ import org.junit.rules.TestName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hbase.thirdparty.com.google.gson.JsonArray; +import org.apache.hbase.thirdparty.com.google.gson.JsonElement; +import org.apache.hbase.thirdparty.com.google.gson.JsonObject; +import org.apache.hbase.thirdparty.com.google.gson.JsonParser; + /** * Tests for HBASE-18408 "AM consumes CPU and fills up the logs really fast when there is no RS to * assign". If an {@link org.apache.hadoop.hbase.exceptions.UnexpectedStateException}, we'd spin on @@ -139,6 +141,10 @@ public class TestUnexpectedStateException { } Thread.sleep(1000); } + TEST_UTIL.getMiniHBaseCluster().stopMaster(0).join(); + HMaster master = TEST_UTIL.getMiniHBaseCluster().startMaster().getMaster(); + TEST_UTIL.waitFor(30000, () -> master.isInitialized()); + am = master.getAssignmentManager(); am.markRegionAsOpened(rsn); t.join(); } -- 2.17.1