From 8c0af07a77461c42209609155c1b0389f64ca293 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Fri, 16 Feb 2018 20:11:03 -0800 Subject: [PATCH] HBASE-20013 TestZKPermissionWatcher is flakey --- .../main/java/org/apache/hadoop/hbase/master/HMaster.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index aa2213043b..efcd6a3193 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -2729,11 +2729,17 @@ public class HMaster extends HRegionServer implements MasterServices { } } - void checkInitialized() - throws PleaseHoldException, ServerNotRunningYetException, MasterNotRunningException { + public static class MasterStoppedException extends DoNotRetryIOException { + MasterStoppedException() { + super(); + } + } + + void checkInitialized() throws PleaseHoldException, ServerNotRunningYetException, + MasterNotRunningException, MasterStoppedException { checkServiceStarted(); if (!isInitialized()) throw new PleaseHoldException("Master is initializing"); - if (isStopped()) throw new MasterNotRunningException(); + if (isStopped()) throw new MasterStoppedException(); } /** -- 2.11.0 (Apple Git-81)