svn commit: r719749 - in /hadoop/core/branches/branch-0.19: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/DFSClient.java src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java

[szetszwo]

Author: szetszwo
Date: Fri Nov 21 15:34:57 2008
New Revision: 719749

URL: http://svn.apache.org/viewvc?rev=719749&view=rev
Log:
HADOOP-4703. Should not wait for proxy forever in lease recovering. (szetszwo)

Modified:
    hadoop/core/branches/branch-0.19/CHANGES.txt
    
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
    
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=719749&r1=719748&r2=719749&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Fri Nov 21 15:34:57 2008
@@ -1004,6 +1004,9 @@
     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

Modified: 
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=719749&r1=719748&r2=719749&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java 
(original)
+++ 
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java 
Fri Nov 21 15:34:57 2008
@@ -137,8 +137,7 @@
     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);
   }
         

Modified: 
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=719749&r1=719748&r2=719749&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 (original)
+++ 
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 Fri Nov 21 15:34:57 2008
@@ -434,7 +434,7 @@
     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);
   }