From common-commits-return-84539-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Tue Jun 19 23:57:58 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 341EC18077D for ; Tue, 19 Jun 2018 23:57:58 +0200 (CEST) Received: (qmail 36090 invoked by uid 500); 19 Jun 2018 21:57:55 -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 35716 invoked by uid 99); 19 Jun 2018 21:57:55 -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; Tue, 19 Jun 2018 21:57:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EA727E04A3; Tue, 19 Jun 2018 21:57:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gifuma@apache.org To: common-commits@hadoop.apache.org Date: Tue, 19 Jun 2018 21:57:55 -0000 Message-Id: <0355b7a468cd44c28f9381c239d716d3@git.apache.org> In-Reply-To: <3a05b2a7a5c545c28213ae9c4403880f@git.apache.org> References: <3a05b2a7a5c545c28213ae9c4403880f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/18] hadoop git commit: HDFS-13676. TestEditLogRace fails on Windows. Contributed by Zuoming Zhang. HDFS-13676. TestEditLogRace fails on Windows. Contributed by Zuoming Zhang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eebeb603 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eebeb603 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eebeb603 Branch: refs/heads/HADOOP-15461 Commit: eebeb6033fd09791fcbff626f128a98e393f0a88 Parents: 43d994e Author: Inigo Goiri Authored: Fri Jun 15 13:07:54 2018 -0700 Committer: Inigo Goiri Committed: Fri Jun 15 13:07:54 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/namenode/TestEditLogRace.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eebeb603/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java index 46010e0..10f571c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java @@ -84,6 +84,8 @@ public class TestEditLogRace { TestEditLogRace.useAsyncEditLog = useAsyncEditLog; } + private static final String NAME_DIR = MiniDFSCluster.getBaseDirectory() + "name-0-1"; + private static final Log LOG = LogFactory.getLog(TestEditLogRace.class); // This test creates NUM_THREADS threads and each thread continuously writes @@ -363,8 +365,8 @@ public class TestEditLogRace { useAsyncEditLog); FileSystem.setDefaultUri(conf, "hdfs://localhost:0"); conf.set(DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY, "0.0.0.0:0"); - //conf.set(DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY, NAME_DIR); - //conf.set(DFSConfigKeys.DFS_NAMENODE_EDITS_DIR_KEY, NAME_DIR); + conf.set(DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY, NAME_DIR); + conf.set(DFSConfigKeys.DFS_NAMENODE_EDITS_DIR_KEY, NAME_DIR); conf.setBoolean(DFSConfigKeys.DFS_PERMISSIONS_ENABLED_KEY, false); return conf; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org