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 F397E200C89 for ; Sat, 3 Jun 2017 16:11:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F1D80160BBE; Sat, 3 Jun 2017 14:11:06 +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 43220160BBB for ; Sat, 3 Jun 2017 16:11:06 +0200 (CEST) Received: (qmail 73343 invoked by uid 500); 3 Jun 2017 14:11:04 -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 73334 invoked by uid 99); 3 Jun 2017 14:11:04 -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; Sat, 03 Jun 2017 14:11:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 232A8DFAEE; Sat, 3 Jun 2017 14:11:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yqlin@apache.org To: common-commits@hadoop.apache.org Message-Id: <539953d9118447888dfadfcd6f03989f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-11899. ASF License warnings generated intermittently in trunk. Contributed by Yiqun Lin. Date: Sat, 3 Jun 2017 14:11:04 +0000 (UTC) archived-at: Sat, 03 Jun 2017 14:11:07 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 5e40efe0e -> 2e8557de1 HDFS-11899. ASF License warnings generated intermittently in trunk. Contributed by Yiqun Lin. (cherry picked from commit 367da9b7b8837d2ffa30a7d2716e463adf2d7007) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2e8557de Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2e8557de Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2e8557de Branch: refs/heads/branch-2 Commit: 2e8557de12c0f58e4c82d3ce8ee2a6f38eacf0c2 Parents: 5e40efe Author: Yiqun Lin Authored: Sat Jun 3 22:07:24 2017 +0800 Committer: Yiqun Lin Committed: Sat Jun 3 22:10:01 2017 +0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/balancer/TestBalancer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e8557de/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 94fe41d..604643a 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 @@ -994,14 +994,14 @@ public class TestBalancer { if (!p.getExcludedNodes().isEmpty()) { args.add("-exclude"); if (useFile) { - excludeHostsFile = new File ("exclude-hosts-file"); + excludeHostsFile = GenericTestUtils.getTestDir("exclude-hosts-file"); PrintWriter pw = new PrintWriter(excludeHostsFile); for (String host : p.getExcludedNodes()) { pw.write( host + "\n"); } pw.close(); args.add("-f"); - args.add("exclude-hosts-file"); + args.add(excludeHostsFile.getAbsolutePath()); } else { args.add(StringUtils.join(p.getExcludedNodes(), ',')); } @@ -1011,14 +1011,14 @@ public class TestBalancer { if (!p.getIncludedNodes().isEmpty()) { args.add("-include"); if (useFile) { - includeHostsFile = new File ("include-hosts-file"); + includeHostsFile = GenericTestUtils.getTestDir("include-hosts-file"); PrintWriter pw = new PrintWriter(includeHostsFile); for (String host : p.getIncludedNodes()) { pw.write( host + "\n"); } pw.close(); args.add("-f"); - args.add("include-hosts-file"); + args.add(includeHostsFile.getAbsolutePath()); } else { args.add(StringUtils.join(p.getIncludedNodes(), ',')); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org