You are viewing a plain text version of this content. The canonical link for it is here.

Posted to hdfs-commits@hadoop.apache.org by to...@apache.org on 2012/04/08 01:24:58 UTC

svn commit: r1310919 - /hadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java

Author: todd
Date: Sat Apr  7 23:24:57 2012
New Revision: 1310919

URL: http://svn.apache.org/viewvc?rev=1310919&view=rev
Log:
HADOOP-8246. Auto-HA: automatically scope znode by nameservice ID. Contributed by Todd Lipcon.

Modified:
    hadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java

Modified: hadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java?rev=1310919&r1=1310918&r2=1310919&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java Sat Apr  7 23:24:57 2012
@@ -117,6 +117,11 @@ public class DFSZKFailoverController ext
         DFS_NAMENODE_USER_NAME_KEY, socAddr.getHostName());
   }
   
+  @Override
+  protected String getScopeInsideParentNode() {
+    return localTarget.getNameServiceId();
+  }
+
   public static void main(String args[])
       throws Exception {
     System.exit(ToolRunner.run(