浏览代码

HADOOP-1695. The SecondaryNamenode waits for the Primary NameNode to
start up. (Dhruba Borthakur)



git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@581982 13f79535-47bb-0310-9956-ffa450edef68

Dhruba Borthakur 18 年之前
父节点
当前提交
093f2914e6
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 3 0
      CHANGES.txt
  2. 2 3
      src/java/org/apache/hadoop/dfs/SecondaryNameNode.java

+ 3 - 0
CHANGES.txt

@@ -238,6 +238,9 @@ Trunk (unreleased changes)
     HADOOP-1626.  Improve dfsadmin help messages.
     (Lohit Vijayarenu via dhruba)
 
+    HADOOP-1695.  The SecondaryNamenode waits for the Primary NameNode to
+    start up.  (Dhruba Borthakur)
+
   IMPROVEMENTS
 
     HADOOP-1908. Restructure data node code so that block sending and 

+ 2 - 3
src/java/org/apache/hadoop/dfs/SecondaryNameNode.java

@@ -95,9 +95,8 @@ public class SecondaryNameNode implements FSConstants, Runnable {
                                              conf.get("fs.default.name", "local"));
     this.conf = conf;
     this.namenode =
-        (ClientProtocol) RPC.getProxy(ClientProtocol.class,
-            ClientProtocol.versionID, nameNodeAddr, conf, NetUtils
-                .getSocketFactory(conf, ClientProtocol.class));
+        (ClientProtocol) RPC.waitForProxy(ClientProtocol.class,
+            ClientProtocol.versionID, nameNodeAddr, conf);
 
     //
     // initialize the webserver for uploading files.