big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-16041. TestErasureCodingCLI fails (#3052)

Browse Source
This commit is contained in:
Hui Fei 2021-05-26 19:12:17 +08:00 committed by GitHub
parent 986d0a4f1d
commit 98a74e2351
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ContentSummary.java
View File

@ -466,7 +466,9 @@ private String formatSize(long size, boolean humanReadable) {
* @return Constant-width String representation of Erasure Coding Policy
*/
public String toErasureCodingPolicy() {
return String.format(ERASURECODING_POLICY_FORMAT, erasureCodingPolicy);
return String.format(ERASURECODING_POLICY_FORMAT,
erasureCodingPolicy.equals("Replicated")
? erasureCodingPolicy : "EC:" + erasureCodingPolicy);
}
/**

4
hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
View File

@ -983,7 +983,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
<expected-output>( |\t)*1( |\t)*2( |\t)*0 EC:[A-Za-z0-9-]{1,}( )*/dir1</expected-output>
<expected-output>( |\t)*1( |\t)*2( |\t)*0( )*EC:[A-Za-z0-9-]{1,}( )*/dir1</expected-output>
</comparator>
</comparators>
</test>
@ -1004,7 +1004,7 @@
</comparator>
<comparator>
<type>RegexpComparator</type>
<expected-output>( |\t)*0( |\t)*1( |\t)*0 [A-Za-z0-9-]{1,}( )*/file1</expected-output>
<expected-output>( |\t)*0( |\t)*1( |\t)*0( )*[A-Za-z0-9-]{1,}( )*/file1</expected-output>
</comparator>
</comparators>
</test>