HADOOP-4703. Should not wait for proxy forever in lease recovering. (szetszwo)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@719752 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -28,6 +28,9 @@ Release 0.18.3 - Unreleased
     HADOOP-4643. NameNode should exclude excessive replicas when counting
     live replicas for a block. (hairong)
 
+    HADOOP-4703. Should not wait for proxy forever in lease recovering.
+    (szetszwo)
+
 Release 0.18.2 - 2008-11-03
 
   BUG FIXES

src/hdfs/org/apache/hadoop/dfs/DFSClient.java

@@ -136,8 +136,7 @@ class DFSClient implements FSConstants {
     if (ClientDatanodeProtocol.LOG.isDebugEnabled()) {
       ClientDatanodeProtocol.LOG.info("ClientDatanodeProtocol addr=" + addr);
     }
-    return (ClientDatanodeProtocol)RPC.waitForProxy(ClientDatanodeProtocol.class
-,
+    return (ClientDatanodeProtocol)RPC.getProxy(ClientDatanodeProtocol.class,
         ClientDatanodeProtocol.versionID, addr, conf);
   }
         

src/hdfs/org/apache/hadoop/dfs/DataNode.java

@@ -453,7 +453,7 @@ public class DataNode extends Configured
     if (InterDatanodeProtocol.LOG.isDebugEnabled()) {
       InterDatanodeProtocol.LOG.info("InterDatanodeProtocol addr=" + addr);
     }
-    return (InterDatanodeProtocol)RPC.waitForProxy(InterDatanodeProtocol.class,
+    return (InterDatanodeProtocol)RPC.getProxy(InterDatanodeProtocol.class,
         InterDatanodeProtocol.versionID, addr, conf);
   }