Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 15D95200C25 for ; Fri, 24 Feb 2017 20:17:30 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 14896160B69; Fri, 24 Feb 2017 19:17:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5D7F5160B62 for ; Fri, 24 Feb 2017 20:17:29 +0100 (CET) Received: (qmail 41839 invoked by uid 500); 24 Feb 2017 19:17:28 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 41823 invoked by uid 99); 24 Feb 2017 19:17:28 -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; Fri, 24 Feb 2017 19:17:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 62900DFC1C; Fri, 24 Feb 2017 19:17:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-10620. StringBuilder created and appended even if logging is disabled. Contributed by Staffan Friberg. Date: Fri, 24 Feb 2017 19:17:28 +0000 (UTC) archived-at: Fri, 24 Feb 2017 19:17:30 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 19c5b3d62 -> bd3c2a2ee HDFS-10620. StringBuilder created and appended even if logging is disabled. Contributed by Staffan Friberg. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bd3c2a2e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bd3c2a2e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bd3c2a2e Branch: refs/heads/branch-2 Commit: bd3c2a2ee951529c39d91a5201e12ab0e202fd49 Parents: 19c5b3d Author: Akira Ajisaka Authored: Sat Feb 25 04:15:43 2017 +0900 Committer: Akira Ajisaka Committed: Sat Feb 25 04:17:17 2017 +0900 ---------------------------------------------------------------------- .../hadoop/hdfs/server/blockmanagement/BlockManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd3c2a2e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java index f2805e2..b06996a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java @@ -1303,16 +1303,19 @@ public class BlockManager implements BlockStatsMXBean { if (!isPopulatingReplQueues()) { return; } - StringBuilder datanodes = new StringBuilder(); + StringBuilder datanodes = blockLog.isDebugEnabled() + ? new StringBuilder() : null; for (DatanodeStorageInfo storage : blocksMap.getStorages(b)) { if (storage.getState() != State.NORMAL) { continue; } final DatanodeDescriptor node = storage.getDatanodeDescriptor(); invalidateBlocks.add(b, node, false); - datanodes.append(node).append(" "); + if (datanodes != null) { + datanodes.append(node).append(" "); + } } - if (datanodes.length() != 0) { + if (datanodes != null && datanodes.length() != 0) { blockLog.debug("BLOCK* addToInvalidates: {} {}", b, datanodes); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org