Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Mar 23, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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());
Expand Down