HDFS-14056. Fix error messages in HDFS-12716. Contributed by Ayush Saxena. (cherry picked from commit 886b935630bf2d46f4c6773de013c093d2e44c38)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e5e4dc42 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e5e4dc42 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e5e4dc42 Branch: refs/heads/branch-3.1 Commit: e5e4dc42a3a896ec9df22459e71a2f23595ff949 Parents: 53b6290 Author: Vinayakumar B <vinayakum...@apache.org> Authored: Fri Nov 16 18:01:13 2018 +0530 Committer: Vinayakumar B <vinayakum...@apache.org> Committed: Fri Nov 16 18:01:54 2018 +0530 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 5 +++-- .../hadoop-hdfs/src/main/resources/hdfs-default.xml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5e4dc42/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java index 787f42c..139b3d0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -294,7 +294,8 @@ public class DataNode extends ReconfigurableBase static final int CURRENT_BLOCK_FORMAT_VERSION = 1; public static final int MAX_VOLUME_FAILURE_TOLERATED_LIMIT = -1; - public static final String MAX_VOLUME_FAILURES_TOLERATED_MSG = "should be greater than -1"; + public static final String MAX_VOLUME_FAILURES_TOLERATED_MSG = + "should be greater than or equal to -1"; /** A list of property that are reconfigurable at runtime. */ private static final List<String> RECONFIGURABLE_PROPERTIES = @@ -1405,7 +1406,7 @@ public class DataNode extends ReconfigurableBase || volFailuresTolerated >= volsConfigured) { throw new DiskErrorException("Invalid value configured for " + "dfs.datanode.failed.volumes.tolerated - " + volFailuresTolerated - + ". Value configured is either greater than -1 or >= " + + ". Value configured is either less than -1 or >= " + "to the number of configured volumes (" + volsConfigured + ")."); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5e4dc42/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml index 50e6e76..3aeb4d8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml @@ -1273,8 +1273,8 @@ <description>The number of volumes that are allowed to fail before a datanode stops offering service. By default any volume failure will cause a datanode to shutdown. - The range of the value is -1 now, -1 represents the minimum - of volume valids is 1. + The value should be greater than or equal to -1 , -1 represents minimum + 1 valid volume. </description> </property> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
