svn commit: r1565844 - in /hadoop/common/branches/HDFS-5698/hadoop-hdfs-project/hadoop-hdfs: CHANGES_HDFS-5698.txt src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java

[jing9]

Author: jing9
Date: Fri Feb  7 23:09:17 2014
New Revision: 1565844

URL: http://svn.apache.org/r1565844
Log:
HDFS-5911. The id of a CacheDirective instance does not get serialized in the 
protobuf-fsimage. Contributed by Haohui Mai.

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

Modified: 
hadoop/common/branches/HDFS-5698/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5698.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5698.txt?rev=1565844&r1=1565843&r2=1565844&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-5698/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5698.txt
 (original)
+++ 
hadoop/common/branches/HDFS-5698/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5698.txt
 Fri Feb  7 23:09:17 2014
@@ -43,3 +43,6 @@ HDFS-5698 subtasks
 
     HDFS-5906. Fixing findbugs and javadoc warnings in the HDFS-5698 branch.
     (Haohui Mai via jing9)
+
+    HDFS-5911. The id of a CacheDirective instance does not get serialized in 
+    the protobuf-fsimage. (Haohui Mai via jing9)

Modified: 
hadoop/common/branches/HDFS-5698/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-5698/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java?rev=1565844&r1=1565843&r2=1565844&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-5698/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java
 (original)
+++ 
hadoop/common/branches/HDFS-5698/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java
 Fri Feb  7 23:09:17 2014
@@ -992,7 +992,8 @@ public final class CacheManager {
 
     for (CacheDirective directive : directivesById.values()) {
       CacheDirectiveInfo info = directive.toInfo();
-      CacheDirectiveInfoProto.Builder b = CacheDirectiveInfoProto.newBuilder();
+      CacheDirectiveInfoProto.Builder b = CacheDirectiveInfoProto.newBuilder()
+          .setId(info.getId());
 
       if (info.getPath() != null) {
         b.setPath(info.getPath().toUri().getPath());