Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-26941 LocalHBaseCluster.waitOnRegionServer should not call join while interrupted (#4352)

Browse Source 
Signed-off-by: Xin Sun <ddupgs@gmail.com>
(cherry picked from commit 35aa57e4452c6f0a7f5037371edca64163913345)
This commit is contained in:
Duo Zhang 2022-04-17 22:56:52 +08:00
parent ae8eccd5c0
commit 085c65107e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
View File

@ -310,15 +310,20 @@ public class LocalHBaseCluster {
* @return Name of region server that just went down. * @return Name of region server that just went down.
*/ */
public String waitOnRegionServer(JVMClusterUtil.RegionServerThread rst) { public String waitOnRegionServer(JVMClusterUtil.RegionServerThread rst) {
boolean interrupted = false;
while (rst.isAlive()) { while (rst.isAlive()) {
try { try {
LOG.info("Waiting on " + rst.getRegionServer().toString()); LOG.info("Waiting on " + rst.getRegionServer().toString());
rst.join(); rst.join();
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); LOG.error("Interrupted while waiting for {} to finish. Retrying join", rst.getName(), e);
interrupted = true;
} }
} }
regionThreads.remove(rst); regionThreads.remove(rst);
if (interrupted) {
Thread.currentThread().interrupt();
}
return rst.getName(); return rst.getName();
} }
@ -382,15 +387,21 @@ public class LocalHBaseCluster {
* @return Name of master that just went down. * @return Name of master that just went down.
*/ */
public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) { public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {
boolean interrupted = false;
while (masterThread.isAlive()) { while (masterThread.isAlive()) {
try { try {
LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString()); LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());
masterThread.join(); masterThread.join();
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); LOG.error("Interrupted while waiting for {} to finish. Retrying join",
masterThread.getName(), e);
interrupted = true;
} }
} }
masterThreads.remove(masterThread); masterThreads.remove(masterThread);
if (interrupted) {
Thread.currentThread().interrupt();
}
return masterThread.getName(); return masterThread.getName();
} }