Revert "HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed by Zsolt Venczel."
This reverts commit 7dc79a8b5b7af0bf37d25a221be8ed446b0edb74.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/ECAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/ECAdmin.java
index 903a1e2..5f8626e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/ECAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/ECAdmin.java
@@ -358,16 +358,16 @@
final DistributedFileSystem dfs = AdminHelper.getDFS(p.toUri(), conf);
try {
dfs.setErasureCodingPolicy(p, ecPolicyName);
-
- String actualECPolicyName = dfs.getErasureCodingPolicy(p).getName();
-
- System.out.println("Set " + actualECPolicyName +
- " erasure coding policy on "+ path);
+ if (ecPolicyName == null){
+ ecPolicyName = "default";
+ }
+ System.out.println("Set " + ecPolicyName + " erasure coding policy on" +
+ " " + path);
RemoteIterator<FileStatus> dirIt = dfs.listStatusIterator(p);
if (dirIt.hasNext()) {
System.out.println("Warning: setting erasure coding policy on a " +
"non-empty directory will not automatically convert existing " +
- "files to " + actualECPolicyName + " erasure coding policy");
+ "files to " + ecPolicyName + " erasure coding policy");
}
} catch (Exception e) {
System.err.println(AdminHelper.prettifyException(e));
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
index 34f5176..6411fe6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
@@ -734,7 +734,7 @@
<comparators>
<comparator>
<type>SubstringComparator</type>
- <expected-output>Set RS-6-3-1024k erasure coding policy on /ecdir</expected-output>
+ <expected-output>Set default erasure coding policy on /ecdir</expected-output>
</comparator>
</comparators>
</test>
@@ -752,11 +752,11 @@
<comparators>
<comparator>
<type>SubstringComparator</type>
- <expected-output>Set RS-6-3-1024k erasure coding policy on /ecdir</expected-output>
+ <expected-output>Set default erasure coding policy on /ecdir</expected-output>
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output>Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to RS-6-3-1024k erasure coding policy</expected-output>
+ <expected-output>Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to default erasure coding policy</expected-output>
</comparator>
</comparators>
</test>
