You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2015/02/05 01:26:47 UTC
[2/3] hadoop git commit: HDFS-7733. NFS: readdir/readdirplus return
null directory attribute on failure. (Contributed by Arpit Agarwal)
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/5807afed
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5807afed
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5807afed
Branch: refs/heads/branch-2
Commit: 5807afed0a4f08b6b2acd88f424bace506e03707
Parents: 2db56a4
Author: Arpit Agarwal <ar...@apache.org>
Authored: Wed Feb 4 16:25:31 2015 -0800
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Wed Feb 4 16:25:40 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/5807afed/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/5807afed/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 28c35bb..d21882c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -589,6 +589,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