hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bra...@apache.org
Subject [06/18] hadoop git commit: Revert "HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed by Zsolt Venczel."
Date Wed, 14 Nov 2018 13:07:41 GMT
Revert "HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed
by Zsolt Venczel."

This reverts commit 7dc79a8b5b7af0bf37d25a221be8ed446b0edb74.


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

Branch: refs/heads/HDFS-13891
Commit: 9da6054ca4ff6f8bb19506d877770685b17d2c79
Parents: 762a56c
Author: Xiao Chen <xiao@apache.org>
Authored: Tue Nov 13 12:43:58 2018 -0800
Committer: Xiao Chen <xiao@apache.org>
Committed: Tue Nov 13 12:44:25 2018 -0800

----------------------------------------------------------------------
 .../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/9da6054c/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 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 @@ public class ECAdmin extends Configured implements Tool {
       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));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9da6054c/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 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>


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


Mime
View raw message