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

HDFS-5268. Merging change r1527087 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527092 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brandon Li 2013-09-27 21:37:47 +00:00
parent d680392e39
commit c4df7fb70e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
View File

@ -424,7 +424,7 @@ class OpenFileCtx {
LOG.warn("Haven't noticed any partial overwrite for a sequential file" LOG.warn("Haven't noticed any partial overwrite for a sequential file"
+ " write requests. Treat it as a real random write, no support."); + " write requests. Treat it as a real random write, no support.");
response = new WRITE3Response(Nfs3Status.NFS3ERR_INVAL, wccData, 0, response = new WRITE3Response(Nfs3Status.NFS3ERR_INVAL, wccData, 0,
WriteStableHow.UNSTABLE, 0); WriteStableHow.UNSTABLE, Nfs3Constant.WRITE_COMMIT_VERF);
} else { } else {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("Process perfectOverWrite"); LOG.debug("Process perfectOverWrite");
@ -561,7 +561,7 @@ class OpenFileCtx {
if (comparator.compare(readbuffer, 0, readCount, data, 0, count) != 0) { if (comparator.compare(readbuffer, 0, readCount, data, 0, count) != 0) {
LOG.info("Perfect overwrite has different content"); LOG.info("Perfect overwrite has different content");
response = new WRITE3Response(Nfs3Status.NFS3ERR_INVAL, wccData, 0, response = new WRITE3Response(Nfs3Status.NFS3ERR_INVAL, wccData, 0,
stableHow, 0); stableHow, Nfs3Constant.WRITE_COMMIT_VERF);
} else { } else {
LOG.info("Perfect overwrite has same content," LOG.info("Perfect overwrite has same content,"
+ " updating the mtime, then return success"); + " updating the mtime, then return success");
@ -573,12 +573,12 @@ class OpenFileCtx {
LOG.info("Got error when processing perfect overwrite, path=" + path LOG.info("Got error when processing perfect overwrite, path=" + path
+ " error:" + e); + " error:" + e);
return new WRITE3Response(Nfs3Status.NFS3ERR_IO, wccData, 0, stableHow, return new WRITE3Response(Nfs3Status.NFS3ERR_IO, wccData, 0, stableHow,
0); Nfs3Constant.WRITE_COMMIT_VERF);
} }
wccData.setPostOpAttr(postOpAttr); wccData.setPostOpAttr(postOpAttr);
response = new WRITE3Response(Nfs3Status.NFS3_OK, wccData, count, response = new WRITE3Response(Nfs3Status.NFS3_OK, wccData, count,
stableHow, 0); stableHow, Nfs3Constant.WRITE_COMMIT_VERF);
} }
return response; return response;
} }

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

@ -113,6 +113,8 @@ Release 2.1.2 - UNRELEASED
HDFS-5031. BlockScanner scans the block multiple times. (Vinay via Arpit HDFS-5031. BlockScanner scans the block multiple times. (Vinay via Arpit
Agarwal) Agarwal)
HDFS-5268. NFS write commit verifier is not set in a few places (brandonli)
Release 2.1.1-beta - 2013-09-23 Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES