Repository: hadoop Updated Branches: refs/heads/branch-2 95bde8898 -> 608ad6c2c
HDFS-7875. Improve log message when wrong value configured for dfs.datanode.failed.volumes.tolerated. Contributed by Nijel. (cherry picked from commit 2da3d2ed2ff2e9b48dbda7e029aa58261c729d35) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/608ad6c2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/608ad6c2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/608ad6c2 Branch: refs/heads/branch-2 Commit: 608ad6c2cd18234ffb551e0784f260e0b3faf402 Parents: 95bde88 Author: Harsh J <[email protected]> Authored: Tue Mar 24 23:03:30 2015 +0530 Committer: Harsh J <[email protected]> Committed: Tue Mar 24 23:03:56 2015 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++ .../hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/608ad6c2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 5f289dd..19c5529 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -8,6 +8,10 @@ Release 2.8.0 - UNRELEASED IMPROVEMENTS + HDFS-7875. Improve log message when wrong value configured for + dfs.datanode.failed.volumes.tolerated. + (nijel via harsh) + HDFS-2360. Ugly stacktrace when quota exceeds. (harsh) HDFS-7835. make initial sleeptime in locateFollowingBlock configurable for http://git-wip-us.apache.org/repos/asf/hadoop/blob/608ad6c2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java index 6a15906..69a80c7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java @@ -278,8 +278,10 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> { this.validVolsRequired = volsConfigured - volFailuresTolerated; if (volFailuresTolerated < 0 || volFailuresTolerated >= volsConfigured) { - throw new DiskErrorException("Invalid volume failure " - + " config value: " + volFailuresTolerated); + throw new DiskErrorException("Invalid value configured for " + + "dfs.datanode.failed.volumes.tolerated - " + volFailuresTolerated + + ". Value configured is either less than 0 or >= " + + "to the number of configured volumes (" + volsConfigured + ")."); } if (volsFailed > volFailuresTolerated) { throw new DiskErrorException("Too many failed volumes - "
