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 ji...@apache.org on 2015/02/24 19:34:11 UTC
hadoop git commit: HDFS-7831. Fix the starting index and end
condition of the loop in FileDiffList.findEarlierSnapshotBlocks().
Contributed by Konstantin Shvachko.
Repository: hadoop
Updated Branches:
refs/heads/trunk 1aea44056 -> 73bcfa99a
HDFS-7831. Fix the starting index and end condition of the loop in FileDiffList.findEarlierSnapshotBlocks(). Contributed by Konstantin Shvachko.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/73bcfa99
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/73bcfa99
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/73bcfa99
Branch: refs/heads/trunk
Commit: 73bcfa99af61e5202f030510db8954c17cba43cc
Parents: 1aea440
Author: Jing Zhao <ji...@apache.org>
Authored: Tue Feb 24 10:31:32 2015 -0800
Committer: Jing Zhao <ji...@apache.org>
Committed: Tue Feb 24 10:31:32 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/73bcfa99/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 2cfd234..618ad70 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1017,6 +1017,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7008. xlator should be closed upon exit from DFSAdmin#genericRefresh().
(ozawa)
+ HDFS-7831. Fix the starting index and end condition of the loop in
+ FileDiffList.findEarlierSnapshotBlocks(). (Konstantin Shvachko via jing9)
+
BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
HDFS-7720. Quota by Storage Type API, tools and ClientNameNode
http://git-wip-us.apache.org/repos/asf/hadoop/blob/73bcfa99/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java
index f9f5056..0c94554 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java
@@ -63,7 +63,7 @@ public class FileDiffList extends
List<FileDiff> diffs = this.asList();
int i = Collections.binarySearch(diffs, snapshotId);
BlockInfoContiguous[] blocks = null;
- for(i = i >= 0 ? i : -i; i < diffs.size(); i--) {
+ for(i = i >= 0 ? i : -i-2; i >= 0; i--) {
blocks = diffs.get(i).getBlocks();
if(blocks != null) {
break;