From de2e84fe2e2baf5d551e27bf44405cb49277f2bd Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Mon, 1 Oct 2018 15:07:59 -0700
Subject: [PATCH] HBASE-21258 Add resetting of flags for RS Group pre/post
 hooks in TestRSGroups

---
 .../hadoop/hbase/rsgroup/TestRSGroups.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
index 264c864b8dc..02acca99e77 100644
--- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
+++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
@@ -133,7 +133,7 @@ public class TestRSGroups extends TestRSGroupsBase {
       INIT = true;
       afterMethod();
     }
-
+    observer.resetFlags();
   }
 
   @After
@@ -297,6 +297,23 @@ public class TestRSGroups extends TestRSGroupsBase {
     boolean preMoveServersAndTables = false;
     boolean postMoveServersAndTables = false;
 
+    void resetFlags() {
+      preBalanceRSGroupCalled = false;
+      postBalanceRSGroupCalled = false;
+      preMoveServersCalled = false;
+      postMoveServersCalled = false;
+      preMoveTablesCalled = false;
+      postMoveTablesCalled = false;
+      preAddRSGroupCalled = false;
+      postAddRSGroupCalled = false;
+      preRemoveRSGroupCalled = false;
+      postRemoveRSGroupCalled = false;
+      preRemoveServersCalled = false;
+      postRemoveServersCalled = false;
+      preMoveServersAndTables = false;
+      postMoveServersAndTables = false;
+    }
+
     @Override
     public Optional<MasterObserver> getMasterObserver() {
       return Optional.of(this);