hadoop git commit: Revert "HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed by Zsolt Venczel."
Repository: hadoop Updated Branches: refs/heads/branch-3.2.0 c5203b044 -> fa48363e2 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/fa48363e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fa48363e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fa48363e Branch: refs/heads/branch-3.2.0 Commit: fa48363e28fb05cd4d453da91e5a36ef0bd366c1 Parents: c5203b0 Author: Sunil G Authored: Wed Nov 21 12:19:53 2018 +0530 Committer: Sunil G Committed: Wed Nov 21 12:19:53 2018 +0530 -- .../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/fa48363e/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 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/fa48363e/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 @@ SubstringComparator - Set RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir @@ -752,11 +752,11 @@ SubstringComparator - Set RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir SubstringComparator - Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to RS-6-3-1024k erasure coding policy + Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to default erasure coding policy - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[06/18] hadoop git commit: Revert "HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed by Zsolt Venczel."
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: 9da6054ca4ff6f8bb19506d80685b17d2c79 Parents: 762a56c Author: Xiao Chen Authored: Tue Nov 13 12:43:58 2018 -0800 Committer: Xiao Chen 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 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 @@ SubstringComparator - Set RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir @@ -752,11 +752,11 @@ SubstringComparator - Set RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir SubstringComparator - Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to RS-6-3-1024k erasure coding policy + Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to default 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: Revert "HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed by Zsolt Venczel."
Repository: hadoop Updated Branches: refs/heads/branch-3.1 abd9d93a5 -> 8ab6aa1b4 Revert "HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed by Zsolt Venczel." This reverts commit 0424715207cd07debeee5c624973e9db90d36fb6. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8ab6aa1b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8ab6aa1b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8ab6aa1b Branch: refs/heads/branch-3.1 Commit: 8ab6aa1b4274a0d3bae3a4ab3b7e6ca252227e39 Parents: abd9d93 Author: Xiao Chen Authored: Tue Nov 13 12:45:35 2018 -0800 Committer: Xiao Chen Committed: Tue Nov 13 12:46:03 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/8ab6aa1b/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 56d453b..56706b2 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); - -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 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/8ab6aa1b/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 b47d50f..9070367 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 RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir @@ -728,11 +728,11 @@ SubstringComparator - Set RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir SubstringComparator - Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to RS-6-3-1024k erasure coding policy + Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to default 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: Revert "HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed by Zsolt Venczel."
Repository: hadoop Updated Branches: refs/heads/branch-3.2 f214af74b -> 5afd7efe2 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/5afd7efe Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5afd7efe Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5afd7efe Branch: refs/heads/branch-3.2 Commit: 5afd7efe24e3c40bb01f3b6baa9c25f72797e42d Parents: f214af7 Author: Xiao Chen Authored: Tue Nov 13 12:45:02 2018 -0800 Committer: Xiao Chen Committed: Tue Nov 13 12:45:55 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/5afd7efe/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 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/5afd7efe/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 @@ SubstringComparator - Set RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir @@ -752,11 +752,11 @@ SubstringComparator - Set RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir SubstringComparator - Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to RS-6-3-1024k erasure coding policy + Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to default 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: Revert "HDFS-13732. ECAdmin should print the policy name when an EC policy is set. Contributed by Zsolt Venczel."
Repository: hadoop Updated Branches: refs/heads/trunk 762a56cc6 -> 9da6054ca 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/trunk Commit: 9da6054ca4ff6f8bb19506d80685b17d2c79 Parents: 762a56c Author: Xiao Chen Authored: Tue Nov 13 12:43:58 2018 -0800 Committer: Xiao Chen 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 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 @@ SubstringComparator - Set RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir @@ -752,11 +752,11 @@ SubstringComparator - Set RS-6-3-1024k erasure coding policy on /ecdir + Set default erasure coding policy on /ecdir SubstringComparator - Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to RS-6-3-1024k erasure coding policy + Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to default erasure coding policy - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org