From 6df36b322b9b566887a10d4674f6975d3c5c9a94 Mon Sep 17 00:00:00 2001 From: Harsh J Date: Tue, 10 Jul 2012 21:15:21 +0000 Subject: [PATCH] Backport of HDFS-3629 from trunk. svn merge -c 1359905 ../../trunk (harsh) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359906 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index d4e8bf6602f..7aa3b56b574 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -115,6 +115,9 @@ Release 2.0.1-alpha - UNRELEASED HDFS-3568. fuse_dfs: add support for security. (Colin McCabe via atm) + HDFS-3629. Fix the typo in the error message about inconsistent + storage layout version. (Brandon Li via harsh) + OPTIMIZATIONS HDFS-2982. Startup performance suffers when there are many edit log diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java index 4e48550abe1..53d47d1fafd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java @@ -1103,7 +1103,7 @@ public class NNStorage extends Storage implements Closeable { } if (multipleLV) { throw new IOException( - "Storage directories containe multiple layout versions: " + "Storage directories contain multiple layout versions: " + layoutVersions); } // If the storage directories are with the new layout version