Addendum fix for HDFS-7749 to be compatible with HDFS-7993
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b65f5089 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b65f5089 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b65f5089 Branch: refs/heads/HDFS-7285 Commit: b65f508988a7a3df0b7f48f7487759d1993294a9 Parents: f827630 Author: Zhe Zhang <z...@apache.org> Authored: Mon Apr 27 11:08:16 2015 -0700 Committer: Jing Zhao <ji...@apache.org> Committed: Wed Apr 29 11:17:52 2015 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/namenode/NamenodeFsck.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b65f5089/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java index 0c564bd..b108cd6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java @@ -629,9 +629,9 @@ public class NamenodeFsck implements DataEncryptionKeyFactory { report.append(" repl=" + liveReplicas); if (showLocations || showRacks || showReplicaDetails) { StringBuilder sb = new StringBuilder("["); - Iterable<DatanodeStorageInfo> storages = bm.getStorages(block.getLocalBlock()); - for (Iterator<DatanodeStorageInfo> iterator = storages.iterator(); iterator.hasNext();) { - DatanodeStorageInfo storage = iterator.next(); + DatanodeStorageInfo[] storages = bm.getStorages(storedBlock); + for (int i = 0; i < storages.length; i++) { + DatanodeStorageInfo storage = storages[i]; DatanodeDescriptor dnDesc = storage.getDatanodeDescriptor(); if (showRacks) { sb.append(NodeBase.getPath(dnDesc)); @@ -640,7 +640,7 @@ public class NamenodeFsck implements DataEncryptionKeyFactory { .getStorageType())); } if (showReplicaDetails) { - LightWeightLinkedSet<Block> blocksExcess = + LightWeightLinkedSet<BlockInfo> blocksExcess = bm.excessReplicateMap.get(dnDesc.getDatanodeUuid()); Collection<DatanodeDescriptor> corruptReplicas = bm.getCorruptReplicas(block.getLocalBlock()); @@ -661,7 +661,7 @@ public class NamenodeFsck implements DataEncryptionKeyFactory { sb.append("LIVE)"); } } - if (iterator.hasNext()) { + if (i < storages.length - 1) { sb.append(", "); } }
