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 84051101FF for ; Sat, 14 Feb 2015 00:34:08 +0000 (UTC) Received: (qmail 65007 invoked by uid 500); 14 Feb 2015 00:34:08 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 64709 invoked by uid 500); 14 Feb 2015 00:34:08 -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 64698 invoked by uid 99); 14 Feb 2015 00:34:08 -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, 14 Feb 2015 00:34:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D97CCE01C2; Sat, 14 Feb 2015 00:34:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cnauroth@apache.org To: common-commits@hadoop.apache.org Date: Sat, 14 Feb 2015 00:34:08 -0000 Message-Id: In-Reply-To: <01ac98b43f584353bee45e52fc757fe3@git.apache.org> References: <01ac98b43f584353bee45e52fc757fe3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hadoop git commit: HDFS-7778. Rename FsVolumeListTest to TestFsVolumeList and commit it to branch-2. Contributed by Lei (Eddy) Xu. HDFS-7778. Rename FsVolumeListTest to TestFsVolumeList and commit it to branch-2. Contributed by Lei (Eddy) Xu. (cherry picked from commit 2efb2347a969ecff75934cd10f2432eade1d77dc) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsVolumeList.java Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/751b834a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/751b834a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/751b834a Branch: refs/heads/branch-2 Commit: 751b834ad19c49ea4fb90059cb28de8fb1a55cee Parents: 3ad1d8d Author: cnauroth Authored: Fri Feb 13 16:30:28 2015 -0800 Committer: cnauroth Committed: Fri Feb 13 16:30:53 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../fsdataset/impl/TestFsVolumeList.java | 101 +++++++++++++++++++ 2 files changed, 104 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/751b834a/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 a4a0f8e..25ab567 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -651,6 +651,9 @@ Release 2.7.0 - UNRELEASED HDFS-7686. Re-add rapid rescan of possibly corrupt block feature to the block scanner (cmccabe) + HDFS-7778. Rename FsVolumeListTest to TestFsVolumeList and commit it to + branch-2. (Lei (Eddy) Xu via cnauroth) + 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/751b834a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsVolumeList.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsVolumeList.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsVolumeList.java new file mode 100644 index 0000000..d477e5b --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsVolumeList.java @@ -0,0 +1,101 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hdfs.server.datanode.fsdataset.impl; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystemTestHelper; +import org.apache.hadoop.hdfs.DFSConfigKeys; +import org.apache.hadoop.hdfs.StorageType; +import org.apache.hadoop.hdfs.server.datanode.BlockScanner; +import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsVolumeReference; +import org.apache.hadoop.hdfs.server.datanode.fsdataset.RoundRobinVolumeChoosingPolicy; +import org.apache.hadoop.hdfs.server.datanode.fsdataset.VolumeChoosingPolicy; +import org.junit.Before; +import org.junit.Test; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertNotEquals; +import static org.mockito.Mockito.mock; + +public class TestFsVolumeList { + + private final Configuration conf = new Configuration(); + private VolumeChoosingPolicy blockChooser = + new RoundRobinVolumeChoosingPolicy<>(); + private FsDatasetImpl dataset = null; + private String baseDir; + private BlockScanner blockScanner; + + @Before + public void setUp() { + dataset = mock(FsDatasetImpl.class); + baseDir = new FileSystemTestHelper().getTestRootDir(); + Configuration blockScannerConf = new Configuration(); + blockScannerConf.setInt(DFSConfigKeys. + DFS_DATANODE_SCAN_PERIOD_HOURS_KEY, -1); + blockScanner = new BlockScanner(null, blockScannerConf); + } + + @Test + public void testGetNextVolumeWithClosedVolume() throws IOException { + FsVolumeList volumeList = new FsVolumeList(0, blockScanner, blockChooser); + List volumes = new ArrayList<>(); + for (int i = 0; i < 3; i++) { + File curDir = new File(baseDir, "nextvolume-" + i); + curDir.mkdirs(); + FsVolumeImpl volume = new FsVolumeImpl(dataset, "storage-id", curDir, + conf, StorageType.DEFAULT); + volume.setCapacityForTesting(1024 * 1024 * 1024); + volumes.add(volume); + volumeList.addVolume(volume.obtainReference()); + } + + // Close the second volume. + volumes.get(1).closeAndWait(); + for (int i = 0; i < 10; i++) { + try (FsVolumeReference ref = + volumeList.getNextVolume(StorageType.DEFAULT, 128)) { + // volume No.2 will not be chosen. + assertNotEquals(ref.getVolume(), volumes.get(1)); + } + } + } + + @Test + public void testCheckDirsWithClosedVolume() throws IOException { + FsVolumeList volumeList = new FsVolumeList(0, blockScanner, blockChooser); + List volumes = new ArrayList<>(); + for (int i = 0; i < 3; i++) { + File curDir = new File(baseDir, "volume-" + i); + curDir.mkdirs(); + FsVolumeImpl volume = new FsVolumeImpl(dataset, "storage-id", curDir, + conf, StorageType.DEFAULT); + volumes.add(volume); + volumeList.addVolume(volume.obtainReference()); + } + + // Close the 2nd volume. + volumes.get(1).closeAndWait(); + // checkDirs() should ignore the 2nd volume since it is closed. + volumeList.checkDirs(); + } +}