HDFS-7155. Bugfix in createLocatedFileStatus caused by bad merge. (Arpit Agarwal)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a2d4edac Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a2d4edac Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a2d4edac Branch: refs/heads/HDFS-6581 Commit: a2d4edacea943c98fe4430e295627cd7535948fc Parents: 7060502 Author: arp <[email protected]> Authored: Fri Sep 26 16:30:47 2014 -0700 Committer: arp <[email protected]> Committed: Fri Sep 26 16:30:47 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt | 2 ++ .../java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2d4edac/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt index e23808d..b7c2b22 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt @@ -80,4 +80,6 @@ HDFS-7144. Fix findbugs warnings in RamDiskReplicaTracker. (szetszwo via Arpit Agarwal) + HDFS-7155. Bugfix in createLocatedFileStatus caused by bad merge. + (Arpit Agarwal) http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2d4edac/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java index 78ee3cf..80d37ca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java @@ -2457,6 +2457,7 @@ public class FSDirectory implements Closeable { final INodeFile fileNode = node.asFile(); size = fileNode.computeFileSize(snapshot); replication = fileNode.getFileReplication(snapshot); + blocksize = fileNode.getPreferredBlockSize(); isLazyPersist = fileNode.getLazyPersistFlag(); final boolean inSnapshot = snapshot != Snapshot.CURRENT_STATE_ID;
