Repository: hadoop
Updated Branches:
  refs/heads/branch-2 96dca785f -> 742f9083f


HDFS-10555: Unable to loadFSEdits due to a failure in readCachePoolInfo. 
Contributed by Uma Maheswara Rao G

(cherry picked from commit 01643020d24b606c26cb2dcaefdb6e47a5f06c8f)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/742f9083
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/742f9083
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/742f9083

Branch: refs/heads/branch-2
Commit: 742f9083f695c0cc7b21020f41d9da0e72da04f6
Parents: 96dca78
Author: Kihwal Lee <kih...@apache.org>
Authored: Thu Jun 23 09:19:49 2016 -0500
Committer: Kihwal Lee <kih...@apache.org>
Committed: Thu Jun 23 09:19:49 2016 -0500

----------------------------------------------------------------------
 .../apache/hadoop/hdfs/server/namenode/FSImageSerialization.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/742f9083/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java
----------------------------------------------------------------------
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java
index c584628..8df65f7 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java
@@ -681,7 +681,7 @@ public class FSImageSerialization {
     if ((flags & 0x20) != 0) {
       info.setDefaultReplication(readShort(in));
     }
-    if ((flags & ~0x2F) != 0) {
+    if ((flags & ~0x3F) != 0) {
       throw new IOException("Unknown flag in CachePoolInfo: " + flags);
     }
     return info;


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to