HBASE-19120 IllegalArgumentException from ZNodeClearer when master shuts down

This commit is contained in:
tedyu 2017-11-01 09:38:41 -07:00
parent f66afa5227
commit 39e8c16fa8
1 changed files with 1 additions and 1 deletions

View File

@ -183,7 +183,7 @@ public class ZNodeClearer {
znodeFileContent = ZNodeClearer.readMyEphemeralNodeOnDisk(); znodeFileContent = ZNodeClearer.readMyEphemeralNodeOnDisk();
if(ZNodeClearer.tablesOnMaster(conf)) { if(ZNodeClearer.tablesOnMaster(conf)) {
//In case of master crash also remove rsZnode since master is also regionserver //In case of master crash also remove rsZnode since master is also regionserver
ZKUtil.deleteNodeFailSilent(zkw, znodeFileContent); ZKUtil.deleteNodeFailSilent(zkw, ZKUtil.joinZNode(zkw.znodePaths.rsZNode,znodeFileContent));
return MasterAddressTracker.deleteIfEquals(zkw, return MasterAddressTracker.deleteIfEquals(zkw,
ZNodeClearer.parseMasterServerName(znodeFileContent)); ZNodeClearer.parseMasterServerName(znodeFileContent));
} else { } else {