hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-19120 IllegalArgumentException from ZNodeClearer when master shuts down
Date Wed, 01 Nov 2017 16:38:20 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 91273e7b0 -> f10f4eb12


HBASE-19120 IllegalArgumentException from ZNodeClearer when master shuts down


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f10f4eb1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f10f4eb1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f10f4eb1

Branch: refs/heads/master
Commit: f10f4eb12133f534d47788121c4cfafd898872f0
Parents: 91273e7
Author: tedyu <yuzhihong@gmail.com>
Authored: Wed Nov 1 09:38:10 2017 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Wed Nov 1 09:38:10 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f4eb1/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java
----------------------------------------------------------------------
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 bd8a58e..5b3278f 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 {


Mime
View raw message