Repository: hadoop Updated Branches: refs/heads/branch-2 53d6c91df -> 7aa6da654
HDFS-7395. BlockIdManager#clear() bails out when resetting the GenerationStampV1Limit. Contributed by Haohui Mai. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7aa6da65 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7aa6da65 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7aa6da65 Branch: refs/heads/branch-2 Commit: 7aa6da654dd1663b2a4fa4ee7c02abf7c9ec6252 Parents: 53d6c91 Author: Haohui Mai <[email protected]> Authored: Thu Nov 13 14:43:03 2014 -0800 Committer: Haohui Mai <[email protected]> Committed: Thu Nov 13 14:43:22 2014 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7aa6da65/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 bb61e14..e66cfac 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -169,6 +169,9 @@ Release 2.7.0 - UNRELEASED HDFS-7358. Clients may get stuck waiting when using ByteArrayManager. (szetszwo) + HDFS-7395. BlockIdManager#clear() bails out when resetting the + GenerationStampV1Limit. (wheat9) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7aa6da65/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java index 8f547f1..1c69203 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java @@ -203,6 +203,6 @@ public class BlockIdManager { generationStampV2.setCurrentValue(GenerationStamp.LAST_RESERVED_STAMP); getBlockIdGenerator().setCurrentValue(SequentialBlockIdGenerator .LAST_RESERVED_BLOCK_ID); - setGenerationStampV1Limit(GenerationStamp.GRANDFATHER_GENERATION_STAMP); + generationStampV1Limit = GenerationStamp.GRANDFATHER_GENERATION_STAMP; } } \ No newline at end of file
