Repository: hadoop
Updated Branches:
  refs/heads/trunk d951af22b -> 7dc79a8b5


HDFS-13732. ECAdmin should print the policy name when an EC policy is set. 
Contributed by Zsolt Venczel.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7dc79a8b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7dc79a8b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7dc79a8b

Branch: refs/heads/trunk
Commit: 7dc79a8b5b7af0bf37d25a221be8ed446b0edb74
Parents: d951af2
Author: Xiao Chen <x...@apache.org>
Authored: Wed Aug 15 13:51:14 2018 -0700
Committer: Xiao Chen <x...@apache.org>
Committed: Wed Aug 15 13:53:47 2018 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hdfs/tools/ECAdmin.java | 12 ++++++------
 .../src/test/resources/testErasureCodingConf.xml        |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7dc79a8b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/ECAdmin.java
----------------------------------------------------------------------
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 56706b2..56d453b 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
@@ -357,16 +357,16 @@ public class ECAdmin extends Configured implements Tool {
       final DistributedFileSystem dfs = AdminHelper.getDFS(p.toUri(), conf);
       try {
         dfs.setErasureCodingPolicy(p, ecPolicyName);
-        if (ecPolicyName == null){
-          ecPolicyName = "default";
-        }
-        System.out.println("Set " + ecPolicyName + " erasure coding policy on" 
+
-            " " + path);
+
+        String actualECPolicyName = dfs.getErasureCodingPolicy(p).getName();
+
+        System.out.println("Set " + actualECPolicyName +
+            " 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 " + ecPolicyName + " erasure coding policy");
+              "files to " + actualECPolicyName + " erasure coding policy");
         }
       } catch (Exception e) {
         System.err.println(AdminHelper.prettifyException(e));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7dc79a8b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
----------------------------------------------------------------------
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 9070367..b47d50f 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
@@ -710,7 +710,7 @@
       <comparators>
         <comparator>
           <type>SubstringComparator</type>
-          <expected-output>Set default erasure coding policy on 
/ecdir</expected-output>
+          <expected-output>Set RS-6-3-1024k erasure coding policy on 
/ecdir</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -728,11 +728,11 @@
       <comparators>
         <comparator>
           <type>SubstringComparator</type>
-          <expected-output>Set default erasure coding policy on 
/ecdir</expected-output>
+          <expected-output>Set RS-6-3-1024k 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 default 
erasure coding policy</expected-output>
+          <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>
         </comparator>
       </comparators>
     </test>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to