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 vi...@apache.org on 2014/11/17 07:30:33 UTC
[31/45] hadoop git commit: HDFS-7395. BlockIdManager#clear() bails
out when resetting the GenerationStampV1Limit. Contributed by Haohui Mai.
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/1a2e5cbc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a2e5cbc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a2e5cbc
Branch: refs/heads/HDFS-EC
Commit: 1a2e5cbc4dbed527fdbefc09abc1faaacf3da285
Parents: 3648cb5
Author: Haohui Mai <wh...@apache.org>
Authored: Thu Nov 13 14:43:03 2014 -0800
Committer: Haohui Mai <wh...@apache.org>
Committed: Thu Nov 13 14:43:03 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/1a2e5cbc/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 e0ef064..957d7ae 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -424,6 +424,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/1a2e5cbc/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