HBASE-29057 Backport missing changes in HBASE-28023 to branch-2 (#6844)

Co-authored-by: lvhaiping.lhp <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
(cherry picked from commit b649bb9)

Author: hiping-tech

hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java

@@ -197,7 +197,7 @@ protected void suspendRs(ServerName server) throws IOException {
     getLogger().info("Suspending regionserver {}", server);
     cluster.suspendRegionServer(server);
     if (!(cluster instanceof MiniHBaseCluster)) {
-      cluster.waitForRegionServerToStop(server, killRsTimeout);
+      cluster.waitForRegionServerToSuspend(server, killRsTimeout);
     }
     getLogger().info("Suspending regionserver {}. Reported num of rs:{}", server,
       cluster.getClusterMetrics().getLiveServerMetrics().size());
@@ -207,7 +207,7 @@ protected void resumeRs(ServerName server) throws IOException {
     getLogger().info("Resuming regionserver {}", server);
     cluster.resumeRegionServer(server);
     if (!(cluster instanceof MiniHBaseCluster)) {
-      cluster.waitForRegionServerToStart(server.getHostname(), server.getPort(), startRsTimeout);
+      cluster.waitForRegionServerToResume(server, startRsTimeout);
     }
     getLogger().info("Resuming regionserver {}. Reported num of rs:{}", server,
       cluster.getClusterMetrics().getLiveServerMetrics().size());