svn commit: r1533616 - in /hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs: CHANGES-HDFS-4949.txt src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java

[cmccabe]

Author: cmccabe
Date: Fri Oct 18 20:20:20 2013
New Revision: 1533616

URL: http://svn.apache.org/r1533616
Log:
HDFS-5388. Loading fsimage fails to find cache pools during namenode startup 
(Chris Nauroth via Colin Patrick McCabe)

Modified:
    
hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4949.txt
    
hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java

Modified: 
hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4949.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4949.txt?rev=1533616&r1=1533615&r2=1533616&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4949.txt
 (original)
+++ 
hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4949.txt
 Fri Oct 18 20:20:20 2013
@@ -101,3 +101,6 @@ HDFS-4949 (Unreleased)
     -replication parameter. (cnauroth)
 
     HDFS-5383. fix broken caching unit tests. (Andrew Wang)
+
+    HDFS-5388. Loading fsimage fails to find cache pools during namenode
+    startup.  (Chris Nauroth via Colin Patrick McCabe)

Modified: 
hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java?rev=1533616&r1=1533615&r2=1533616&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java
 (original)
+++ 
hadoop/common/branches/HDFS-4949/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java
 Fri Oct 18 20:20:20 2013
@@ -742,7 +742,7 @@ public final class CacheManager {
       String poolName = Text.readString(in);
       // Get pool reference by looking it up in the map
       CachePool pool = cachePools.get(poolName);
-      if (pool != null) {
+      if (pool == null) {
         throw new IOException("Entry refers to pool " + poolName +
             ", which does not exist.");
       }