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

HDFS-11565. Use compact identifiers for built-in ECPolicies in HdfsFileStatus.

This commit is contained in:
Andrew Wang 2017-04-12 12:24:32 -07:00
parent abce613356
commit 966b1b5b44
3 changed files with 113 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelperClient.java
View File

@ -94,6 +94,7 @@ import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport;
import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport.DiffReportEntry;
import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport.DiffType;
import org.apache.hadoop.hdfs.protocol.SnapshottableDirectoryStatus;
import org.apache.hadoop.hdfs.protocol.SystemErasureCodingPolicies;
import org.apache.hadoop.hdfs.protocol.proto.AclProtos.AclEntryProto;
import org.apache.hadoop.hdfs.protocol.proto.AclProtos.AclEntryProto.AclEntryScopeProto;
import org.apache.hadoop.hdfs.protocol.proto.AclProtos.AclEntryProto.AclEntryTypeProto;
@ -2641,20 +2642,37 @@ public class PBHelperClient {
}
public static ErasureCodingPolicy convertErasureCodingPolicy(
ErasureCodingPolicyProto policy) {
return new ErasureCodingPolicy(policy.getName(),
convertECSchema(policy.getSchema()),
policy.getCellSize(), (byte) policy.getId());
ErasureCodingPolicyProto proto) {
final byte id = (byte) (proto.getId() & 0xFF);
ErasureCodingPolicy policy = SystemErasureCodingPolicies.getByID(id);
if (policy == null) {
// If it's not a built-in policy, populate from the optional PB fields.
// The optional fields are required in this case.
Preconditions.checkArgument(proto.hasName(),
"Missing name field in ErasureCodingPolicy proto");
Preconditions.checkArgument(proto.hasSchema(),
"Missing schema field in ErasureCodingPolicy proto");
Preconditions.checkArgument(proto.hasCellSize(),
"Missing cellsize field in ErasureCodingPolicy proto");
return new ErasureCodingPolicy(proto.getName(),
convertECSchema(proto.getSchema()),
proto.getCellSize(), id);
}
return policy;
}
public static ErasureCodingPolicyProto convertErasureCodingPolicy(
ErasureCodingPolicy policy) {
ErasureCodingPolicyProto.Builder builder = ErasureCodingPolicyProto
.newBuilder()
.setName(policy.getName())
.setSchema(convertECSchema(policy.getSchema()))
.setCellSize(policy.getCellSize())
.setId(policy.getId());
// If it's not a built-in policy, need to set the optional fields.
if (SystemErasureCodingPolicies.getByID(policy.getId()) == null) {
builder.setName(policy.getName())
.setSchema(convertECSchema(policy.getSchema()))
.setCellSize(policy.getCellSize());
}
return builder.build();
}

6
hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto
View File

@ -352,9 +352,9 @@ message ECSchemaProto {
}
message ErasureCodingPolicyProto {
required string name = 1;
required ECSchemaProto schema = 2;
required uint32 cellSize = 3;
optional string name = 1;
optional ECSchemaProto schema = 2;
optional uint32 cellSize = 3;
required uint32 id = 4; // Actually a byte - only 8 bits used
}

86
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocolPB/TestPBHelper.java
View File

@ -17,9 +17,14 @@
*/
package org.apache.hadoop.hdfs.protocolPB;
import com.google.protobuf.UninitializedMessageException;
import org.apache.hadoop.hdfs.protocol.SystemErasureCodingPolicies;
import org.apache.hadoop.hdfs.server.protocol.SlowDiskReports;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@ -100,8 +105,10 @@ import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
import org.apache.hadoop.hdfs.server.protocol.SlowPeerReports;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;
import org.apache.hadoop.io.erasurecode.ECSchema;
import org.apache.hadoop.security.proto.SecurityProtos.TokenProto;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.DataChecksum;
import org.junit.Assert;
import org.junit.Test;
@ -892,7 +899,7 @@ public class TestPBHelper {
DataChecksum.Type.valueOf(DFSConfigKeys.DFS_CHECKSUM_TYPE_DEFAULT).id));
HdfsProtos.FsServerDefaultsProto proto = b.build();
Assert.assertFalse("KeyProvider uri is not supported",
assertFalse("KeyProvider uri is not supported",
proto.hasKeyProviderUri());
FsServerDefaults fsServerDefaults = PBHelperClient.convert(proto);
Assert.assertNotNull("FsServerDefaults is null", fsServerDefaults);
@ -900,4 +907,81 @@ public class TestPBHelper {
fsServerDefaults.getKeyProviderUri());
}
@Test
public void testConvertErasureCodingPolicy() throws Exception {
// Check conversion of the built-in policies.
for (ErasureCodingPolicy policy :
SystemErasureCodingPolicies.getPolicies()) {
HdfsProtos.ErasureCodingPolicyProto proto = PBHelperClient
.convertErasureCodingPolicy(policy);
// Optional fields should not be set.
assertFalse("Unnecessary field is set.", proto.hasName());
assertFalse("Unnecessary field is set.", proto.hasSchema());
assertFalse("Unnecessary field is set.", proto.hasCellSize());
// Convert proto back to an object and check for equality.
ErasureCodingPolicy convertedPolicy = PBHelperClient
.convertErasureCodingPolicy(proto);
assertEquals("Converted policy not equal", policy, convertedPolicy);
}
// Check conversion of a non-built-in policy.
ECSchema newSchema = new ECSchema("testcodec", 3, 2);
ErasureCodingPolicy newPolicy =
new ErasureCodingPolicy(newSchema, 128 * 1024, (byte) 254);
HdfsProtos.ErasureCodingPolicyProto proto = PBHelperClient
.convertErasureCodingPolicy(newPolicy);
// Optional fields should be set.
assertTrue("Optional field not set", proto.hasName());
assertTrue("Optional field not set", proto.hasSchema());
assertTrue("Optional field not set", proto.hasCellSize());
ErasureCodingPolicy convertedPolicy = PBHelperClient
.convertErasureCodingPolicy(proto);
// Converted policy should be equal.
assertEquals("Converted policy not equal", newPolicy, convertedPolicy);
}
@Test(expected = UninitializedMessageException.class)
public void testErasureCodingPolicyMissingId() throws Exception {
HdfsProtos.ErasureCodingPolicyProto.Builder builder =
HdfsProtos.ErasureCodingPolicyProto.newBuilder();
PBHelperClient.convertErasureCodingPolicy(builder.build());
}
@Test
public void testErasureCodingPolicyMissingOptionalFields() throws Exception {
// For non-built-in policies, the optional fields are required
// when parsing an ErasureCodingPolicyProto.
HdfsProtos.ECSchemaProto schemaProto =
PBHelperClient.convertECSchema(
StripedFileTestUtil.getDefaultECPolicy().getSchema());
try {
PBHelperClient.convertErasureCodingPolicy(
HdfsProtos.ErasureCodingPolicyProto.newBuilder()
.setId(14)
.setSchema(schemaProto)
.setCellSize(123)
.build());
} catch (IllegalArgumentException e) {
GenericTestUtils.assertExceptionContains("Missing", e);
}
try {
PBHelperClient.convertErasureCodingPolicy(
HdfsProtos.ErasureCodingPolicyProto.newBuilder()
.setId(14)
.setName("testpolicy")
.setCellSize(123)
.build());
} catch (IllegalArgumentException e) {
GenericTestUtils.assertExceptionContains("Missing", e);
}
try {
PBHelperClient.convertErasureCodingPolicy(
HdfsProtos.ErasureCodingPolicyProto.newBuilder()
.setId(14)
.setName("testpolicy")
.setSchema(schemaProto)
.build());
} catch (IllegalArgumentException e) {
GenericTestUtils.assertExceptionContains("Missing", e);
}
}
}