Browse Source

commit b2d7a3dbee22d44a94e9fbebe70cdb33c7e3e808
Author: Suresh Srinivas <sureshms@yahoo-inc.com>
Date: Mon Mar 15 12:05:31 2010 -0700

HDFS-187 from https://issues.apache.org/jira/secure/attachment/12430266/hdfs-187-0.20.txt


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077318 13f79535-47bb-0310-9956-ffa450edef68

Owen O'Malley 14 years ago
parent
commit
c9c7f19cb3
2 changed files with 7 additions and 1 deletions
  1. 5 0
      CHANGES.txt
  2. 2 1
      src/test/org/apache/hadoop/hdfs/server/namenode/TestStartup.java

+ 5 - 0
CHANGES.txt

@@ -17,6 +17,11 @@ Release 0.20.2 - Unreleased
     before it constructs and sends its own ack message for the packet.
     before it constructs and sends its own ack message for the packet.
     (hairong)
     (hairong)
 
 
+  IMPROVEMENTS
+
+    HDFS-187. Initialize secondary namenode http address in TestStartup.
+    (Todd Lipcon via szetszwo)
+
 Release 0.20.1 - 2009-09-01
 Release 0.20.1 - 2009-09-01
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 2 - 1
src/test/org/apache/hadoop/hdfs/server/namenode/TestStartup.java

@@ -28,7 +28,7 @@ import org.apache.hadoop.util.StringUtils;
  */
  */
 public class TestStartup extends TestCase {
 public class TestStartup extends TestCase {
   public static final String NAME_NODE_HOST = "localhost:";
   public static final String NAME_NODE_HOST = "localhost:";
-  public static final String NAME_NODE_HTTP_HOST = "0.0.0.0:";
+  public static final String WILDCARD_HTTP_HOST = "0.0.0.0:";
   private static final Log LOG =
   private static final Log LOG =
     LogFactory.getLog(TestStartup.class.getName());
     LogFactory.getLog(TestStartup.class.getName());
   private Configuration config;
   private Configuration config;
@@ -65,6 +65,7 @@ public class TestStartup extends TestCase {
     config.set("dfs.data.dir", new File(hdfsDir, "data").getPath());
     config.set("dfs.data.dir", new File(hdfsDir, "data").getPath());
 
 
     config.set("fs.checkpoint.dir",new File(hdfsDir, "secondary").getPath());
     config.set("fs.checkpoint.dir",new File(hdfsDir, "secondary").getPath());
+    config.set("dfs.secondary.http.address", WILDCARD_HTTP_HOST + "0");
     //config.set("fs.default.name", "hdfs://"+ NAME_NODE_HOST + "0");
     //config.set("fs.default.name", "hdfs://"+ NAME_NODE_HOST + "0");
     
     
     FileSystem.setDefaultUri(config, "hdfs://"+NAME_NODE_HOST + "0");
     FileSystem.setDefaultUri(config, "hdfs://"+NAME_NODE_HOST + "0");