Repository: hadoop Updated Branches: refs/heads/branch-2 719ae5f2e -> e00ad6fca
HDFS-11571. Typo in DataStorage exception message (Contributed by Anna Budai via Daniel Templeton) (cherry picked from commit 15e3873dc3d46016344887570e5d4aa8d20ca264) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e00ad6fc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e00ad6fc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e00ad6fc Branch: refs/heads/branch-2 Commit: e00ad6fca58c59743ef229f61d2d4da74b440f16 Parents: 719ae5f Author: Daniel Templeton <[email protected]> Authored: Wed Mar 29 10:56:36 2017 -0700 Committer: Daniel Templeton <[email protected]> Committed: Wed Mar 29 10:57:52 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java | 2 +- .../org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e00ad6fc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java index 9951ed6..c7cdf4b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java @@ -554,7 +554,7 @@ public class DataStorage extends Storage { void recoverTransitionRead(DataNode datanode, NamespaceInfo nsInfo, Collection<StorageLocation> dataDirs, StartupOption startOpt) throws IOException { if (addStorageLocations(datanode, nsInfo, dataDirs, startOpt).isEmpty()) { - throw new IOException("All specified directories are failed to load."); + throw new IOException("All specified directories have failed to load."); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/e00ad6fc/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java index 446a77b..04d4cd7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java @@ -201,7 +201,7 @@ public class TestDataStorage { fail("An IOException should throw: all StorageLocations are NON_EXISTENT"); } catch (IOException e) { GenericTestUtils.assertExceptionContains( - "All specified directories are failed to load.", e); + "All specified directories have failed to load.", e); } assertEquals(0, storage.getNumStorageDirs()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
