Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HDFS-12505. Extend TestFileStatusWithECPolicy with a random EC policy. Contributed by Takanobu Asanuma." 

This reverts commit 84c1095586.
This commit is contained in:
Xiao Chen 2018-03-13 10:30:07 -07:00
parent 3b8dbc2cb7
commit f82d38dcb3
2 changed files with 5 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java
View File

@ -34,10 +34,7 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.Timeout; 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 MiniDFSCluster cluster;
private DistributedFileSystem fs; private DistributedFileSystem fs;
private DFSClient client; private DFSClient client;
@ -53,7 +50,8 @@ public class TestFileStatusWithDefaultECPolicy {
cluster.waitActive(); cluster.waitActive();
fs = cluster.getFileSystem(); fs = cluster.getFileSystem();
client = fs.getClient(); client = fs.getClient();
fs.enableErasureCodingPolicy(getEcPolicy().getName()); fs.enableErasureCodingPolicy(
StripedFileTestUtil.getDefaultECPolicy().getName());
} }
@After @After
@ -64,10 +62,6 @@ public class TestFileStatusWithDefaultECPolicy {
} }
} }
public ErasureCodingPolicy getEcPolicy() {
return StripedFileTestUtil.getDefaultECPolicy();
}
@Test @Test
public void testFileStatusWithECPolicy() throws Exception { public void testFileStatusWithECPolicy() throws Exception {
// test directory doesn't have an EC policy // test directory doesn't have an EC policy
@ -82,7 +76,8 @@ public class TestFileStatusWithDefaultECPolicy {
ContractTestUtils.assertNotErasureCoded(fs, file); ContractTestUtils.assertNotErasureCoded(fs, file);
fs.delete(file, true); fs.delete(file, true);
final ErasureCodingPolicy ecPolicy1 = getEcPolicy(); final ErasureCodingPolicy ecPolicy1 =
StripedFileTestUtil.getDefaultECPolicy();
// set EC policy on dir // set EC policy on dir
fs.setErasureCodingPolicy(dir, ecPolicy1.getName()); fs.setErasureCodingPolicy(dir, ecPolicy1.getName());
ContractTestUtils.assertErasureCoded(fs, dir); ContractTestUtils.assertErasureCoded(fs, dir);

49
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithRandomECPolicy.java
View File

@ -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;
}
}