From 39e8c16fa81624f36042e30242561efccc66589f Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Wed, 1 Nov 2017 09:38:41 -0700
Subject: [PATCH] HBASE-19120 IllegalArgumentException from ZNodeClearer when
 master shuts down

---
 .../src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java
index bd8a58e467c..5b3278ff0ee 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java
@@ -183,7 +183,7 @@ public class ZNodeClearer {
       znodeFileContent = ZNodeClearer.readMyEphemeralNodeOnDisk();
       if(ZNodeClearer.tablesOnMaster(conf)) {
       //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, 
                                     ZNodeClearer.parseMasterServerName(znodeFileContent));
       } else {