svn commit: r1466323 - in /hadoop/common/branches/branch-1.2: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java

[suresh]

Author: suresh
Date: Wed Apr 10 03:51:36 2013
New Revision: 1466323

URL: http://svn.apache.org/r1466323
Log:
HDFS-4413. Merge 1466322 from branch-1

Modified:
    hadoop/common/branches/branch-1.2/CHANGES.txt
    
hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1466323&r1=1466322&r2=1466323&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Wed Apr 10 03:51:36 2013
@@ -551,6 +551,9 @@ Release 1.2.0 - unreleased
     MAPREDUCE-5131. Fix handling of job monitoring APIs during JobTracker
     restart. (acmurthy) 
 
+    HDFS-4413. Secondary namenode won't start if HDFS isn't the default
+    file system. (Mostafa Elhemali via suresh)
+
 Release 1.1.2 - 2013.01.30
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java?rev=1466323&r1=1466322&r2=1466323&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
 (original)
+++ 
hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
 Wed Apr 10 03:51:36 2013
@@ -476,11 +476,10 @@ public class SecondaryNameNode implement
    * Returns the Jetty server that the Namenode is listening on.
    */
   private String getInfoServer() throws IOException {
-    URI fsName = FileSystem.getDefaultUri(conf);
-    if (!"hdfs".equals(fsName.getScheme())) {
+    String infoAddr = NameNode.getInfoServer(conf);
+    if (infoAddr == null) {
       throw new IOException("This is not a DFS");
     }
-    String infoAddr = NameNode.getInfoServer(conf);
     LOG.debug("infoAddr = " + infoAddr);
     return infoAddr;
   }