[11/14] hadoop git commit: HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed by Zsolt Venczel.

2018-08-20 Thread arp 
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/04247152
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/04247152
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/04247152

Branch: refs/heads/branch-3.1
Commit: 0424715207cd07debeee5c624973e9db90d36fb6
Parents: 81fbfe5
Author: Xiao Chen 
Authored: Wed Aug 15 13:51:14 2018 -0700
Committer: Arpit Agarwal 
Committed: Mon Aug 20 14:57:07 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/04247152/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 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/04247152/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 @@
   
 
   SubstringComparator
-  Set default erasure coding policy on 
/ecdir
+  Set RS-6-3-1024k erasure coding policy on 
/ecdir
 
   
 
@@ -728,11 +728,11 @@
   
 
   SubstringComparator
-  Set default erasure coding policy on 
/ecdir
+  Set RS-6-3-1024k erasure coding policy on 
/ecdir
 
 
   SubstringComparator
-  Warning: setting erasure coding policy on a 
non-empty directory will not automatically convert existing files to default 
erasure coding policy
+  Warning: setting erasure coding policy on a 
non-empty directory will not automatically convert existing files to 
RS-6-3-1024k erasure coding policy
 
   
 


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

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

2018-08-15 Thread xiao 
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 
Authored: Wed Aug 15 13:51:14 2018 -0700
Committer: Xiao Chen 
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 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 @@
   
 
   SubstringComparator
-  Set default erasure coding policy on 
/ecdir
+  Set RS-6-3-1024k erasure coding policy on 
/ecdir
 
   
 
@@ -728,11 +728,11 @@
   
 
   SubstringComparator
-  Set default erasure coding policy on 
/ecdir
+  Set RS-6-3-1024k erasure coding policy on 
/ecdir
 
 
   SubstringComparator
-  Warning: setting erasure coding policy on a 
non-empty directory will not automatically convert existing files to default 
erasure coding policy
+  Warning: setting erasure coding policy on a 
non-empty directory will not automatically convert existing files to 
RS-6-3-1024k erasure coding policy
 
   
 


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