HDFS-13785. EC: 'removePolicy' is not working for built-in/system Erasure Code policies. Contributed by Ayush Saxena
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a517ee4f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a517ee4f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a517ee4f Branch: refs/heads/branch-3.1 Commit: a517ee4f5be39828bf18795462457fdf1bb0db00 Parents: 7540699 Author: Vinayakumar B <[email protected]> Authored: Wed Aug 8 12:42:20 2018 +0530 Committer: Arpit Agarwal <[email protected]> Committed: Mon Aug 20 14:51:53 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/tools/ECAdmin.java | 4 ++-- .../src/site/markdown/HDFSErasureCoding.md | 4 ++-- .../test/resources/testErasureCodingConf.xml | 22 +++++++++++++++++++- 3 files changed, 25 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a517ee4f/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 9b9fe14..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 @@ -154,7 +154,7 @@ public class ECAdmin extends Configured implements Tool { listing.addRow("<file>", "The path of the xml file which defines the EC policies to add"); return getShortUsage() + "\n" + - "Add a list of erasure coding policies.\n" + + "Add a list of user defined erasure coding policies.\n" + listing.toString(); } @@ -268,7 +268,7 @@ public class ECAdmin extends Configured implements Tool { TableListing listing = AdminHelper.getOptionDescriptionListing(); listing.addRow("<policy>", "The name of the erasure coding policy"); return getShortUsage() + "\n" + - "Remove an erasure coding policy.\n" + + "Remove an user defined erasure coding policy.\n" + listing.toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/a517ee4f/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSErasureCoding.md ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSErasureCoding.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSErasureCoding.md index f3b920f..2e8cbbd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSErasureCoding.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSErasureCoding.md @@ -203,7 +203,7 @@ Below are the details about each command. * `[-addPolicies -policyFile <file>]` - Add a list of erasure coding policies. Please refer etc/hadoop/user_ec_policies.xml.template for the example policy file. The maximum cell size is defined in property 'dfs.namenode.ec.policies.max.cellsize' with the default value 4MB. Currently HDFS allows the user to add 64 policies in total, and the added policy ID is in range of 64 to 127. Adding policy will fail if there are already 64 policies added. + Add a list of user defined erasure coding policies. Please refer etc/hadoop/user_ec_policies.xml.template for the example policy file. The maximum cell size is defined in property 'dfs.namenode.ec.policies.max.cellsize' with the default value 4MB. Currently HDFS allows the user to add 64 policies in total, and the added policy ID is in range of 64 to 127. Adding policy will fail if there are already 64 policies added. * `[-listCodecs]` @@ -211,7 +211,7 @@ Below are the details about each command. * `[-removePolicy -policy <policyName>]` - Remove an erasure coding policy. + Remove an user defined erasure coding policy. * `[-enablePolicy -policy <policyName>]` http://git-wip-us.apache.org/repos/asf/hadoop/blob/a517ee4f/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 2f7a6a7..9070367 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml @@ -154,7 +154,7 @@ <comparators> <comparator> <type>SubstringComparator</type> - <expected-output>Add a list of erasure coding policies</expected-output> + <expected-output>Add a list of user defined erasure coding policies</expected-output> </comparator> <comparator> <type>SubstringComparator</type> @@ -164,6 +164,26 @@ </test> <test> + <description>help: removePolicy command</description> + <test-commands> + <ec-admin-command>-fs NAMENODE -help removePolicy + </ec-admin-command> + </test-commands> + <cleanup-commands> + </cleanup-commands> + <comparators> + <comparator> + <type>SubstringComparator</type> + <expected-output>Remove an user defined erasure coding policy</expected-output> + </comparator> + <comparator> + <type>SubstringComparator</type> + <expected-output>[-removePolicy -policy <policy>]</expected-output> + </comparator> + </comparators> + </test> + + <test> <description>help: enablePolicy command</description> <test-commands> <ec-admin-command>-fs NAMENODE -help enablePolicy</ec-admin-command> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
