HDFS-12505. Extend TestFileStatusWithECPolicy with a random EC policy. Contributed by Takanobu Asanuma.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84c10955 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84c10955 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84c10955 Branch: refs/heads/HDFS-7240 Commit: 84c10955863eca1e300aeeac1d9cd7a1186144b6 Parents: b2b9ce5 Author: Xiao Chen <x...@apache.org> Authored: Tue Mar 13 09:57:20 2018 -0700 Committer: Xiao Chen <x...@apache.org> Committed: Tue Mar 13 09:58:03 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/TestFileStatusWithECPolicy.java | 15 ++++-- .../hdfs/TestFileStatusWithRandomECPolicy.java | 49 ++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/84c10955/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java index 077cf3a..a57777a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java @@ -34,7 +34,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; -public class TestFileStatusWithECPolicy { +/** + * This test ensures the statuses of EC files with the default policy. + */ +public class TestFileStatusWithDefaultECPolicy { private MiniDFSCluster cluster; private DistributedFileSystem fs; private DFSClient client; @@ -50,8 +53,7 @@ public class TestFileStatusWithECPolicy { cluster.waitActive(); fs = cluster.getFileSystem(); client = fs.getClient(); - fs.enableErasureCodingPolicy( - StripedFileTestUtil.getDefaultECPolicy().getName()); + fs.enableErasureCodingPolicy(getEcPolicy().getName()); } @After @@ -62,6 +64,10 @@ public class TestFileStatusWithECPolicy { } } + public ErasureCodingPolicy getEcPolicy() { + return StripedFileTestUtil.getDefaultECPolicy(); + } + @Test public void testFileStatusWithECPolicy() throws Exception { // test directory doesn't have an EC policy @@ -76,8 +82,7 @@ public class TestFileStatusWithECPolicy { ContractTestUtils.assertNotErasureCoded(fs, file); fs.delete(file, true); - final ErasureCodingPolicy ecPolicy1 = - StripedFileTestUtil.getDefaultECPolicy(); + final ErasureCodingPolicy ecPolicy1 = getEcPolicy(); // set EC policy on dir fs.setErasureCodingPolicy(dir, ecPolicy1.getName()); ContractTestUtils.assertErasureCoded(fs, dir); http://git-wip-us.apache.org/repos/asf/hadoop/blob/84c10955/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithRandomECPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithRandomECPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithRandomECPolicy.java new file mode 100644 index 0000000..18902a7 --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithRandomECPolicy.java @@ -0,0 +1,49 @@ +/** + * 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; + +import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * This test extends TestFileStatusWithDefaultECPolicy to use a random + * (non-default) EC policy. + */ +public class TestFileStatusWithRandomECPolicy extends + TestFileStatusWithDefaultECPolicy { + private static final Logger LOG = LoggerFactory.getLogger( + TestFileStatusWithRandomECPolicy.class); + + private ErasureCodingPolicy ecPolicy; + + public TestFileStatusWithRandomECPolicy() { + // If you want to debug this test with a specific ec policy, please use + // SystemErasureCodingPolicies class. + // e.g. ecPolicy = SystemErasureCodingPolicies.getByID(RS_3_2_POLICY_ID); + ecPolicy = StripedFileTestUtil.getRandomNonDefaultECPolicy(); + LOG.info("run {} with {}.", + TestFileStatusWithRandomECPolicy.class + .getSuperclass().getSimpleName(), ecPolicy.getName()); + } + + @Override + public ErasureCodingPolicy getEcPolicy() { + return ecPolicy; + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
