hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [1/3] hadoop git commit: HDFS-7733. NFS: readdir/readdirplus return null directory attribute on failure. (Contributed by Arpit Agarwal)
Date Thu, 05 Feb 2015 00:26:46 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 2db56a493 -> 5807afed0
  refs/heads/branch-2.6 ebb515f5e -> ef212fbe7
  refs/heads/trunk 30510cff7 -> c6f20007e


HDFS-7733. NFS: readdir/readdirplus return null directory attribute on failure. (Contributed
by Arpit Agarwal)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c6f20007
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c6f20007
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c6f20007

Branch: refs/heads/trunk
Commit: c6f20007ebda509b39a7e4098b99e9b43d73d5b2
Parents: 30510cf
Author: Arpit Agarwal <arp@apache.org>
Authored: Wed Feb 4 16:25:31 2015 -0800
Committer: Arpit Agarwal <arp@apache.org>
Committed: Wed Feb 4 16:25:31 2015 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java     | 9 +++++++--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                 | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6f20007/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
index 7ca21e8..05d0674 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
@@ -1577,7 +1577,9 @@ public class RpcProgramNfs3 extends RpcProgram implements Nfs3Interface
{
         } else {
           LOG.error("CookieVerf mismatch. request cookieVerf: " + cookieVerf
               + " dir cookieVerf: " + dirStatus.getModificationTime());
-          return new READDIR3Response(Nfs3Status.NFS3ERR_BAD_COOKIE);
+          return new READDIR3Response(
+              Nfs3Status.NFS3ERR_BAD_COOKIE,
+              Nfs3Utils.getFileAttr(dfsClient, dirFileIdPath, iug));
         }
       }
 
@@ -1740,7 +1742,10 @@ public class RpcProgramNfs3 extends RpcProgram implements Nfs3Interface
{
         } else {
           LOG.error("cookieverf mismatch. request cookieverf: " + cookieVerf
               + " dir cookieverf: " + dirStatus.getModificationTime());
-          return new READDIRPLUS3Response(Nfs3Status.NFS3ERR_BAD_COOKIE);
+          return new READDIRPLUS3Response(
+              Nfs3Status.NFS3ERR_BAD_COOKIE,
+              Nfs3Utils.getFileAttr(dfsClient, dirFileIdPath, iug),
+              0, null);
         }
       }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6f20007/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 9793f72e..0b60964 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -871,6 +871,9 @@ Release 2.6.1 - UNRELEASED
     HDFS-3443. Fix NPE when namenode transition to active during startup by
     adding checkNNStartup() in NameNodeRpcServer.  (Vinayakumar B via szetszwo)
 
+    HDFS-7733. NFS: readdir/readdirplus return null directory
+    attribute on failure. (Arpit Agarwal)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES


Mime
View raw message