hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1240914 - in /hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main: java/org/apache/hadoop/ha/NodeFencer.java java/org/apache/hadoop/ha/SshFenceByTcpPort.java resources/core-default.xml
Date Mon, 06 Feb 2012 08:21:06 GMT
Author: eli
Date: Mon Feb  6 08:21:06 2012
New Revision: 1240914

URL: http://svn.apache.org/viewvc?rev=1240914&view=rev
Log:
HDFS-2819. Document new HA-related configs in hdfs-default.xml. Contributed by Eli Collins

Modified:
    hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java
    hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java
    hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java?rev=1240914&r1=1240913&r2=1240914&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java
Mon Feb  6 08:21:06 2012
@@ -55,7 +55,7 @@ import com.google.common.collect.Lists;
 @InterfaceStability.Evolving
 public class NodeFencer {
   public static final String CONF_METHODS_KEY =
-    "dfs.namenode.ha.fencing.methods";
+    "dfs.ha.fencing.methods";
   
   private static final String CLASS_RE = "([a-zA-Z0-9\\.\\$]+)";
   private static final Pattern CLASS_WITH_ARGUMENT =
@@ -92,7 +92,7 @@ public class NodeFencer {
   }
 
   public boolean fence(InetSocketAddress serviceAddr) {
-    LOG.info("====== Beginning NameNode Fencing Process... ======");
+    LOG.info("====== Beginning Service Fencing Process... ======");
     int i = 0;
     for (FenceMethodWithArg method : methods) {
       LOG.info("Trying method " + (++i) + "/" + methods.size() +": " + method);
@@ -112,7 +112,7 @@ public class NodeFencer {
       LOG.warn("Fencing method " + method + " was unsuccessful.");
     }
     
-    LOG.error("Unable to fence NameNode by any configured method.");
+    LOG.error("Unable to fence service by any configured method.");
     return false;
   }
 

Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java?rev=1240914&r1=1240913&r2=1240914&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java
Mon Feb  6 08:21:06 2012
@@ -52,7 +52,7 @@ import com.jcraft.jsch.Session;
  * with ssh.
  * <p>
  * In order to achieve passwordless SSH, the operator must also configure
- * <code>dfs.namenode.ha.fencing.ssh.private-key-files<code> to point to an
+ * <code>dfs.ha.fencing.ssh.private-key-files<code> to point to an
  * SSH key that has passphrase-less access to the given username and host.
  */
 public class SshFenceByTcpPort extends Configured
@@ -62,11 +62,11 @@ public class SshFenceByTcpPort extends C
       SshFenceByTcpPort.class);
   
   static final String CONF_CONNECT_TIMEOUT_KEY =
-    "dfs.namenode.ha.fencing.ssh.connect-timeout";
+    "dfs.ha.fencing.ssh.connect-timeout";
   private static final int CONF_CONNECT_TIMEOUT_DEFAULT =
     30*1000;
   static final String CONF_IDENTITIES_KEY =
-    "dfs.namenode.ha.fencing.ssh.private-key-files";
+    "dfs.ha.fencing.ssh.private-key-files";
 
   /**
    * Verify that the argument, if given, in the conf is parseable.

Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1240914&r1=1240913&r2=1240914&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
Mon Feb  6 08:21:06 2012
@@ -842,4 +842,30 @@
   </description>
 </property>
 
+<property>
+  <name>dfs.ha.fencing.methods</name>
+  <value></value>
+  <description>
+    List of fencing methods to use for service fencing. May contain
+    builtin methods (eg shell and sshfence) or user-defined method.
+  </description>
+</property>
+
+<property>
+  <name>dfs.ha.fencing.ssh.connect-timeout</name>
+  <value>30000</value>
+  <description>
+    SSH connection timeout, in milliseconds, to use with the builtin
+    sshfence fencer.
+  </description>
+</property>
+
+<property>
+  <name>dfs.ha.fencing.ssh.private-key-files</name>
+  <value></value>
+  <description>
+    The SSH private key files to use with the builtin sshfence fencer.
+  </description>
+</property>
+
 </configuration>



Mime
View raw message