From ef212fbe7e54522bd26b708a70650df03b844fa6 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Wed, 4 Feb 2015 16:25:31 -0800 Subject: [PATCH] HDFS-7733. NFS: readdir/readdirplus return null directory attribute on failure. (Contributed by Arpit Agarwal) --- .../org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 9 +++++++-- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) 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 91d066e723d..33c5253374e 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 @@ -1529,7 +1529,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)); } } @@ -1692,7 +1694,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); } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index b662fd47546..b8003d228c2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -30,6 +30,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