HDFS-9245. Fix findbugs warnings in hdfs-nfs/WriteCtx. Contributed by Mingliang Liu.

(cherry picked from commit 6e4562b844)
This commit is contained in:
Xiaoyu Yao 2015-11-10 16:35:06 -08:00
parent 48a494cdc3
commit f3a075e053
2 changed files with 18 additions and 7 deletions

View File

@ -98,7 +98,7 @@ class WriteCtx {
*/
private int trimDelta;
public int getOriginalCount() {
public synchronized int getOriginalCount() {
return originalCount;
}
@ -158,7 +158,7 @@ class WriteCtx {
}
// Resized write should not allow dump
Preconditions.checkState(originalCount == INVALID_ORIGINAL_COUNT);
Preconditions.checkState(getOriginalCount() == INVALID_ORIGINAL_COUNT);
this.raf = raf;
dumpFileOffset = dumpOut.getChannel().position();
@ -193,6 +193,13 @@ class WriteCtx {
}
}
/**
* @return the offset field
*/
private synchronized long getPlainOffset() {
return offset;
}
int getCount() {
synchronized(this) {
// See comment "Overlapping Write Request Handling" above
@ -253,8 +260,8 @@ class WriteCtx {
try {
dataBuffer = getData();
} catch (Exception e1) {
LOG.error("Failed to get request data offset:" + offset + " count:"
+ count + " error:" + e1);
LOG.error("Failed to get request data offset:" + getPlainOffset() + " " +
"count:" + count + " error:" + e1);
throw new IOException("Can't get WriteCtx.data");
}
@ -311,8 +318,9 @@ class WriteCtx {
@Override
public String toString() {
return "Id:" + handle.getFileId() + " offset:" + offset + " count:" + count
+ " originalCount:" + originalCount + " stableHow:" + stableHow
+ " replied:" + replied + " dataState:" + dataState + " xid:" + xid;
return "Id:" + handle.getFileId() + " offset:" + getPlainOffset() + " " +
"count:" + count + " originalCount:" + getOriginalCount() +
" stableHow:" + stableHow + " replied:" + replied + " dataState:" +
dataState + " xid:" + xid;
}
}

View File

@ -1441,6 +1441,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9234. WebHdfs: getContentSummary() should give quota for storage types.
(Surendra Singh Lilhore via xyao)
HDFS-9245. Fix findbugs warnings in hdfs-nfs/WriteCtx.
(Mingliang Liu via xyao)
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES