Repository: hbase Updated Branches: refs/heads/branch-2.0 2e885195a -> 346aa6c99
HBASE-21113 Apply the branch-2 version of HBASE-21095, The timeout retry logic for several procedures are broken after master restarts(addendum) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/346aa6c9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/346aa6c9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/346aa6c9 Branch: refs/heads/branch-2.0 Commit: 346aa6c99f013af072a3894392ec2c4cf37b988f Parents: 2e88519 Author: Allan Yang <allan...@apache.org> Authored: Sun Aug 26 22:10:23 2018 +0800 Committer: Allan Yang <allan...@apache.org> Committed: Sun Aug 26 22:10:23 2018 +0800 ---------------------------------------------------------------------- .../hbase/master/assignment/TestUnexpectedStateException.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/346aa6c9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java ---------------------------------------------------------------------- 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 16648c0..868b93b 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 @@ -69,8 +69,6 @@ public class TestUnexpectedStateException { @BeforeClass public static void beforeClass() throws Exception { - TEST_UTIL.getConfiguration().setBoolean("hbase.localcluster.assign.random.ports", false); - TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, 50655); TEST_UTIL.startMiniCluster(); }