Author: harsh
Date: Tue Jul 10 21:15:21 2012
New Revision: 1359906
URL: http://svn.apache.org/viewvc?rev=1359906&view=rev
Log:
Backport of HDFS-3629 from trunk. svn merge -c 1359905 ../../trunk (harsh)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1359906&r1=1359905&r2=1359906&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Tue Jul 10 21:15:21 2012
@@ -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
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java?rev=1359906&r1=1359905&r2=1359906&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
Tue Jul 10 21:15:21 2012
@@ -1103,7 +1103,7 @@ public class NNStorage extends Storage i
}
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
