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

HBASE-21518 TestMasterFailoverWithProcedures is flaky 

Signed-off-by: Sean Busbey <busbey@apache.org>
This commit is contained in:
Peter Somogyi 2018-11-29 18:04:53 +01:00
parent d42e0ade1c
commit dfeab9f5c9
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
View File

@ -249,14 +249,24 @@ public class JVMClusterUtil {
// Do backups first. // Do backups first.
JVMClusterUtil.MasterThread activeMaster = null; JVMClusterUtil.MasterThread activeMaster = null;
for (JVMClusterUtil.MasterThread t : masters) { for (JVMClusterUtil.MasterThread t : masters) {
if (!t.master.isActiveMaster()) { // Master was killed but could be still considered as active. Check first if it is stopped.
try { if (!t.master.isStopped()) {
t.master.stopMaster(); if (!t.master.isActiveMaster()) {
} catch (IOException e) { try {
LOG.error("Exception occurred while stopping master", e); t.master.stopMaster();
} catch (IOException e) {
LOG.error("Exception occurred while stopping master", e);
}
LOG.info("Stopped backup Master {} is stopped: {}",
t.master.hashCode(), t.master.isStopped());
} else {
if (activeMaster != null) {
LOG.warn("Found more than 1 active master, hash {}", activeMaster.master.hashCode());
}
activeMaster = t;
LOG.debug("Found active master hash={}, stopped={}",
t.master.hashCode(), t.master.isStopped());
} }
} else {
activeMaster = t;
} }
} }
// Do active after. // Do active after.