hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r1465124 - in /hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project: ./ hadoop-hdfs/ hadoop-hdfs/CHANGES.txt hadoop-hdfs/src/main/java/ hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java
Date Fri, 05 Apr 2013 20:49:34 GMT
Author: cos
Date: Fri Apr  5 20:49:34 2013
New Revision: 1465124

URL: http://svn.apache.org/r1465124
Log:
svn merge -c1465121 from trunk

HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value. Contributed by
Jagane Sundar


Modified:
    hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/   (props changed)
    hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/   (props changed)
    hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
  (props changed)
    hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java

Propchange: hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-hdfs-project:r1465121

Propchange: hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1465121

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1465124&r1=1465123&r2=1465124&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Apr  5 20:49:34 2013
@@ -66,6 +66,9 @@ Release 2.0.4-alpha - UNRELEASED
 
   BUG FIXES
 
+  HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value
+  (Jagane Sundar via cos)
+
 Release 2.0.3-alpha - 2013-02-06
 
   INCOMPATIBLE CHANGES

Propchange: hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1465121

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java?rev=1465124&r1=1465123&r2=1465124&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java
(original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java
Fri Apr  5 20:49:34 2013
@@ -260,7 +260,9 @@ public class NameNodeProxies {
     final long version = RPC.getProtocolVersion(ClientNamenodeProtocolPB.class);
     ClientNamenodeProtocolPB proxy = RPC.getProtocolProxy(
         ClientNamenodeProtocolPB.class, version, address, ugi, conf,
-        NetUtils.getDefaultSocketFactory(conf), 0, defaultPolicy).getProxy();
+        NetUtils.getDefaultSocketFactory(conf),
+        org.apache.hadoop.ipc.Client.getTimeout(conf), defaultPolicy)
+            .getProxy();
 
     if (withRetries) { // create the proxy with retries
 



Mime
View raw message