Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 30A3617F7D for ; Mon, 27 Apr 2015 18:15:06 +0000 (UTC) Received: (qmail 49375 invoked by uid 500); 27 Apr 2015 18:14:44 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 49039 invoked by uid 500); 27 Apr 2015 18:14:44 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 46423 invoked by uid 99); 27 Apr 2015 18:14:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 18:14:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7016FE30F3; Mon, 27 Apr 2015 18:14:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhz@apache.org To: common-commits@hadoop.apache.org Date: Mon, 27 Apr 2015 18:15:31 -0000 Message-Id: <803c965b8b7d4f3b97b52c090676462a@git.apache.org> In-Reply-To: <823a77c46fe54bb0981bcff0a915ce9a@git.apache.org> References: <823a77c46fe54bb0981bcff0a915ce9a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [50/50] hadoop git commit: Addendum fix for HDFS-7749 to be compatible with HDFS-7993 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/bc3091b1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bc3091b1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bc3091b1 Branch: refs/heads/HDFS-7285 Commit: bc3091b180af2ea7b7b15f76155e0b573601f88d Parents: 355f9cb Author: Zhe Zhang Authored: Mon Apr 27 11:08:16 2015 -0700 Committer: Zhe Zhang Committed: Mon Apr 27 11:08:16 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/bc3091b1/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 storages = bm.getStorages(block.getLocalBlock()); - for (Iterator 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 blocksExcess = + LightWeightLinkedSet blocksExcess = bm.excessReplicateMap.get(dnDesc.getDatanodeUuid()); Collection 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(", "); } }