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 xy...@apache.org on 2015/11/11 01:35:34 UTC
hadoop git commit: HDFS-9245. Fix findbugs warnings in
hdfs-nfs/WriteCtx. Contributed by Mingliang Liu.
Repository: hadoop
Updated Branches:
refs/heads/trunk a06e6b81e -> 6e4562b84
HDFS-9245. Fix findbugs warnings in hdfs-nfs/WriteCtx. Contributed by Mingliang Liu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e4562b8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e4562b8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e4562b8
Branch: refs/heads/trunk
Commit: 6e4562b844dfbbbdc0074323900eb69ee2a3e9c2
Parents: a06e6b8
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Tue Nov 10 16:35:06 2015 -0800
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Tue Nov 10 16:35:06 2015 -0800
----------------------------------------------------------------------
.../apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java | 22 +++++++++++++-------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
2 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e4562b8/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java
index 8c2c7ee..f4c32f6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java
@@ -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;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e4562b8/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 e55bcd6..53d20cc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2290,6 +2290,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9364. Unnecessary DNS resolution attempts when creating NameNodeProxies.
(Xiao Chen via zhz)
+ HDFS-9245. Fix findbugs warnings in hdfs-nfs/WriteCtx.
+ (Mingliang Liu via xyao)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES