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 B8F67200B6A for ; Mon, 8 Aug 2016 00:09:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B778A160AB1; Sun, 7 Aug 2016 22:09:31 +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 09565160A87 for ; Mon, 8 Aug 2016 00:09:30 +0200 (CEST) Received: (qmail 1917 invoked by uid 500); 7 Aug 2016 22:09:30 -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 1906 invoked by uid 99); 7 Aug 2016 22:09:30 -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; Sun, 07 Aug 2016 22:09:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E7EF3E2C1A; Sun, 7 Aug 2016 22:09:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shv@apache.org To: common-commits@hadoop.apache.org Message-Id: <18ec3d52458d4139beb6bfe74d26cc5d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-10693. metaSave should print blocks, not LightWeightHashSet. Contributed by Yuanbo Liu. Date: Sun, 7 Aug 2016 22:09:29 +0000 (UTC) archived-at: Sun, 07 Aug 2016 22:09:31 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 9cdd97a15 -> ab130f97c HDFS-10693. metaSave should print blocks, not LightWeightHashSet. Contributed by Yuanbo Liu. (cherry picked from commit 4d3af47f2765f6f57936d316ef2a4150b787cc97) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ab130f97 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ab130f97 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ab130f97 Branch: refs/heads/branch-2 Commit: ab130f97ca90b84461d0979bc6d3236562f00cca Parents: 9cdd97a Author: Konstantin V Shvachko Authored: Sun Aug 7 14:29:26 2016 -0700 Committer: Konstantin V Shvachko Committed: Sun Aug 7 14:35:35 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java | 3 ++- .../java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab130f97/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java index b72c78f..f1a201d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.DatanodeInfo; import org.apache.hadoop.hdfs.server.namenode.NameNode; import org.apache.hadoop.hdfs.util.LightWeightHashSet; +import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Time; import org.apache.hadoop.hdfs.DFSUtil; @@ -151,7 +152,7 @@ class InvalidateBlocks { final LightWeightHashSet blocks = entry.getValue(); if (blocks.size() > 0) { out.println(entry.getKey()); - out.println(blocks); + out.println(StringUtils.join(',', blocks)); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab130f97/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java index 6a82cc3..14f9382 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java @@ -172,6 +172,7 @@ public class TestMetaSave { //skip 2 lines to reach HDFS-9033 scenario. line = reader.readLine(); line = reader.readLine(); + assertTrue(line.contains("blk")); // skip 1 line for Corrupt Blocks section. line = reader.readLine(); line = reader.readLine(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org