Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Arpit Agarwal 2015-02-04 16:25:31 -08:00
parent 30510cff75
commit c6f20007eb
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
View File

@ -1577,7 +1577,9 @@ public class RpcProgramNfs3 extends RpcProgram implements Nfs3Interface {
} else { } else {
LOG.error("CookieVerf mismatch. request cookieVerf: " + cookieVerf LOG.error("CookieVerf mismatch. request cookieVerf: " + cookieVerf
+ " dir cookieVerf: " + dirStatus.getModificationTime()); + " 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 { } else {
LOG.error("cookieverf mismatch. request cookieverf: " + cookieVerf LOG.error("cookieverf mismatch. request cookieverf: " + cookieVerf
+ " dir cookieverf: " + dirStatus.getModificationTime()); + " 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);
} }
} }

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -871,6 +871,9 @@ Release 2.6.1 - UNRELEASED
HDFS-3443. Fix NPE when namenode transition to active during startup by HDFS-3443. Fix NPE when namenode transition to active during startup by
adding checkNNStartup() in NameNodeRpcServer. (Vinayakumar B via szetszwo) 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 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES