Repository: hadoop Updated Branches: refs/heads/branch-3.1 441576528 -> ccb799e3a
Revert "HDFS-12505. Extend TestFileStatusWithECPolicy with a random EC policy. Contributed by Takanobu Asanuma." This reverts commit 98d69733f706b5c2e207c625773dd75015b1423e. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ccb799e3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ccb799e3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ccb799e3 Branch: refs/heads/branch-3.1 Commit: ccb799e3a02e8f05f1bd74870f500292ba156941 Parents: 4415765 Author: Xiao Chen <x...@apache.org> Authored: Tue Mar 13 10:33:28 2018 -0700 Committer: Xiao Chen <x...@apache.org> Committed: Tue Mar 13 10:39:42 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/TestFileStatusWithECPolicy.java | 15 ++---- .../hdfs/TestFileStatusWithRandomECPolicy.java | 49 -------------------- 2 files changed, 5 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ccb799e3/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 a57777a..077cf3a 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,10 +34,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; -/** - * This test ensures the statuses of EC files with the default policy. - */ -public class TestFileStatusWithDefaultECPolicy { +public class TestFileStatusWithECPolicy { private MiniDFSCluster cluster; private DistributedFileSystem fs; private DFSClient client; @@ -53,7 +50,8 @@ public class TestFileStatusWithDefaultECPolicy { cluster.waitActive(); fs = cluster.getFileSystem(); client = fs.getClient(); - fs.enableErasureCodingPolicy(getEcPolicy().getName()); + fs.enableErasureCodingPolicy( + StripedFileTestUtil.getDefaultECPolicy().getName()); } @After @@ -64,10 +62,6 @@ public class TestFileStatusWithDefaultECPolicy { } } - public ErasureCodingPolicy getEcPolicy() { - return StripedFileTestUtil.getDefaultECPolicy(); - } - @Test public void testFileStatusWithECPolicy() throws Exception { // test directory doesn't have an EC policy @@ -82,7 +76,8 @@ public class TestFileStatusWithDefaultECPolicy { ContractTestUtils.assertNotErasureCoded(fs, file); fs.delete(file, true); - final ErasureCodingPolicy ecPolicy1 = getEcPolicy(); + final ErasureCodingPolicy ecPolicy1 = + StripedFileTestUtil.getDefaultECPolicy(); // set EC policy on dir fs.setErasureCodingPolicy(dir, ecPolicy1.getName()); ContractTestUtils.assertErasureCoded(fs, dir); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ccb799e3/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 deleted file mode 100644 index 18902a7..0000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithRandomECPolicy.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * 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
