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 84B4217C1D for ; Wed, 18 Mar 2015 19:35:57 +0000 (UTC) Received: (qmail 15620 invoked by uid 500); 18 Mar 2015 19:35:56 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 15417 invoked by uid 500); 18 Mar 2015 19:35:56 -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 15142 invoked by uid 99); 18 Mar 2015 19:35:56 -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; Wed, 18 Mar 2015 19:35:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BAFDE18CA; Wed, 18 Mar 2015 19:35:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Wed, 18 Mar 2015 19:35:58 -0000 Message-Id: <8d6bdf623c684891ac8d362b4667aacd@git.apache.org> In-Reply-To: <51233fc6a6ae425fbc01d4f5dffab184@git.apache.org> References: <51233fc6a6ae425fbc01d4f5dffab184@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] hadoop git commit: HDFS-7950. Fix TestFsDatasetImpl#testAddVolumes failure on Windows. (Contributed by Xiaoyu Yao) HDFS-7950. Fix TestFsDatasetImpl#testAddVolumes failure on Windows. (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/ae6d273d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ae6d273d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ae6d273d Branch: refs/heads/branch-2.7 Commit: ae6d273d63fdd8234bd420f63009496b57fd9dc5 Parents: 502c040 Author: Arpit Agarwal Authored: Wed Mar 18 12:33:59 2015 -0700 Committer: Arpit Agarwal Committed: Wed Mar 18 12:35:41 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../datanode/fsdataset/impl/TestFsDatasetImpl.java | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae6d273d/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 0ee0ab8..0234241 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -858,6 +858,9 @@ Release 2.7.0 - UNRELEASED HDFS-7948. TestDataNodeHotSwapVolumes#testAddVolumeFailures failed on Windows. (Xiaoyu Yao via Arpit Agarwal) + HDFS-7950. Fix TestFsDatasetImpl#testAddVolumes failure on Windows. + (Xiaoyu Yao via Arpit Agarwal) + BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS HDFS-7720. Quota by Storage Type API, tools and ClientNameNode http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae6d273d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java index 8654773..73fcd19 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java @@ -21,6 +21,7 @@ import com.google.common.collect.Lists; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystemTestHelper; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.StorageType; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.HdfsConfiguration; @@ -111,7 +112,7 @@ public class TestFsDatasetImpl { List dirStrings = new ArrayList(); for (int i = 0; i < numDirs; i++) { File loc = new File(BASE_DIR + "/data" + i); - dirStrings.add(loc.toString()); + dirStrings.add(new Path(loc.toString()).toUri().toString()); loc.mkdirs(); dirs.add(createStorageDirectory(loc)); when(storage.getStorageDir(i)).thenReturn(dirs.get(i)); @@ -158,8 +159,9 @@ public class TestFsDatasetImpl { } for (int i = 0; i < numNewVolumes; i++) { String path = BASE_DIR + "/newData" + i; - expectedVolumes.add(path); - StorageLocation loc = StorageLocation.parse(path); + String pathUri = new Path(path).toUri().toString(); + expectedVolumes.add(new File(pathUri).toString()); + StorageLocation loc = StorageLocation.parse(pathUri); Storage.StorageDirectory sd = createStorageDirectory(new File(path)); DataStorage.VolumeBuilder builder = new DataStorage.VolumeBuilder(storage, sd); @@ -178,7 +180,8 @@ public class TestFsDatasetImpl { actualVolumes.add( dataset.getVolumes().get(numExistingVolumes + i).getBasePath()); } - assertEquals(actualVolumes, expectedVolumes); + assertEquals(actualVolumes.size(), expectedVolumes.size()); + assertTrue(actualVolumes.containsAll(expectedVolumes)); } @Test(timeout = 30000)