Repository: hadoop Updated Branches: refs/heads/branch-2 5d3c130e8 -> 5bb47d041
HDFS-7399. Lack of synchronization in DFSOutputStream#Packet#getLastByteOffsetBlock() (Contributed by Vinayakumar B) (cherry picked from commit 6783d17fcf5b25165767888f756a6b7802ab1371) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5bb47d04 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5bb47d04 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5bb47d04 Branch: refs/heads/branch-2 Commit: 5bb47d041893bd63c18e497c718ed7893d1aec97 Parents: 5d3c130 Author: Vinayakumar B <[email protected]> Authored: Mon Nov 17 20:19:19 2014 +0530 Committer: Vinayakumar B <[email protected]> Committed: Mon Nov 17 20:20:36 2014 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5bb47d04/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 694be33..0357398 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -178,6 +178,9 @@ Release 2.7.0 - UNRELEASED HDFS-7395. BlockIdManager#clear() bails out when resetting the GenerationStampV1Limit. (wheat9) + HDFS-7399. Lack of synchronization in + DFSOutputStream#Packet#getLastByteOffsetBlock() (vinayakumarb) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/5bb47d04/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java index 8f18afe..e21badf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java @@ -342,12 +342,12 @@ public class DFSOutputStream extends FSOutputSummer bam.release(buf); buf = null; } - + // get the packet's last byte's offset in the block - long getLastByteOffsetBlock() { + synchronized long getLastByteOffsetBlock() { return offsetInBlock + dataPos - dataStart; } - + /** * Check if this packet is a heart beat packet * @return true if the sequence number is HEART_BEAT_SEQNO
