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 57C6010B98 for ; Sun, 9 Nov 2014 16:54:14 +0000 (UTC) Received: (qmail 15873 invoked by uid 500); 9 Nov 2014 16:54:04 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 15290 invoked by uid 500); 9 Nov 2014 16:54:04 -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 14502 invoked by uid 99); 9 Nov 2014 16:54:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Nov 2014 16:54:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8E7628BE339; Sun, 9 Nov 2014 16:54:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vinayakumarb@apache.org To: common-commits@hadoop.apache.org Date: Sun, 09 Nov 2014 16:54:21 -0000 Message-Id: <58bd01b5dabe44d6a566167ece5fb976@git.apache.org> In-Reply-To: <58421c16f88b4f058d171f1d2a41a4ec@git.apache.org> References: <58421c16f88b4f058d171f1d2a41a4ec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/30] hadoop git commit: HDFS-7379. TestBalancer#testBalancerWithRamDisk creates test files incorrectly. Contributed by Xiaoyu Yao. HDFS-7379. TestBalancer#testBalancerWithRamDisk creates test files incorrectly. Contributed by Xiaoyu Yao. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/57760c06 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/57760c06 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/57760c06 Branch: refs/heads/HDFS-EC Commit: 57760c0663288a7611c3609891ef92f1abf4bb53 Parents: 06b7979 Author: Haohui Mai Authored: Fri Nov 7 13:39:09 2014 -0800 Committer: Haohui Mai Committed: Fri Nov 7 13:39:09 2014 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/57760c06/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 8735d61..0595764 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1043,6 +1043,9 @@ Release 2.6.0 - UNRELEASED HDFS-7364. Balancer always shows zero Bytes Already Moved. (Tsz Wo Nicholas Sze via jing9) + HDFS-7379. TestBalancer#testBalancerWithRamDisk creates test files + incorrectly. (Xiaoyu Yao via wheat9) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HDFS-6387. HDFS CLI admin tool for creating & deleting an http://git-wip-us.apache.org/repos/asf/hadoop/blob/57760c06/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java index 698aa69..6955fcd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java @@ -1213,7 +1213,7 @@ public class TestBalancer { DFSTestUtil.createFile(fs, path1, true, DEFAULT_RAM_DISK_BLOCK_SIZE, 4 * DEFAULT_RAM_DISK_BLOCK_SIZE, DEFAULT_RAM_DISK_BLOCK_SIZE, REPL_FACT, SEED, true); - DFSTestUtil.createFile(fs, path1, true, + DFSTestUtil.createFile(fs, path2, true, DEFAULT_RAM_DISK_BLOCK_SIZE, 1 * DEFAULT_RAM_DISK_BLOCK_SIZE, DEFAULT_RAM_DISK_BLOCK_SIZE, REPL_FACT, SEED, true);