From e1a3167cf9b47fef7e29bd2b799c9f642d382ab1 Mon Sep 17 00:00:00 2001 From: "guo.kangkang" Date: Thu, 9 Jan 2020 17:24:38 +0800 Subject: [PATCH] HBASE-23669 ZNodeClearer#clear() throws IllegalArgumentException --- hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 697706507b..4aba565171 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 @@ -185,8 +185,7 @@ public final 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, - ZNodePaths.joinZNode(zkw.getZNodePaths().rsZNode, znodeFileContent)); + ZKUtil.deleteNodeFailSilent(zkw, znodeFileContent); return MasterAddressTracker.deleteIfEquals(zkw, ZNodeClearer.parseMasterServerName(znodeFileContent)); } else { -- 2.15.1 (Apple Git-101)