Repository: hadoop Updated Branches: refs/heads/branch-2.7 e5df5ce97 -> b9c2cda84
Fix potential FSImage corruption. Contributed by Ekanth Sethuramalingam & Arpit Agarwal. (cherry picked from commit 0a1e922f3d8eca4e852be57124ec1bcafaadb289) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b9c2cda8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b9c2cda8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b9c2cda8 Branch: refs/heads/branch-2.7 Commit: b9c2cda844d91a78ce247992b96ba6669575f95c Parents: e5df5ce Author: Konstantin V Shvachko <s...@apache.org> Authored: Mon Jul 16 18:20:24 2018 -0700 Committer: Konstantin V Shvachko <s...@apache.org> Committed: Wed Jul 18 17:06:24 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/AclEntryStatusFormat.java | 6 ++++-- .../hadoop/hdfs/server/namenode/INodeWithAdditionalFields.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b9c2cda8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclEntryStatusFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclEntryStatusFormat.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclEntryStatusFormat.java index 82aa214..2c5b23b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclEntryStatusFormat.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclEntryStatusFormat.java @@ -38,7 +38,8 @@ import com.google.common.collect.ImmutableList; * [1:3) -- the type of the entry (AclEntryType) <br> * [3:6) -- the permission of the entry (FsAction) <br> * [6:7) -- A flag to indicate whether Named entry or not <br> - * [7:32) -- the name of the entry, which is an ID that points to a <br> + * [7:8) -- Reserved <br> + * [8:32) -- the name of the entry, which is an ID that points to a <br> * string in the StringTableSection. <br> */ public enum AclEntryStatusFormat { @@ -47,7 +48,8 @@ public enum AclEntryStatusFormat { TYPE(SCOPE.BITS, 2), PERMISSION(TYPE.BITS, 3), NAMED_ENTRY_CHECK(PERMISSION.BITS, 1), - NAME(NAMED_ENTRY_CHECK.BITS, 25); + RESERVED(NAMED_ENTRY_CHECK.BITS, 1), + NAME(RESERVED.BITS, 24); private final LongBitFormat BITS; http://git-wip-us.apache.org/repos/asf/hadoop/blob/b9c2cda8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeWithAdditionalFields.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeWithAdditionalFields.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeWithAdditionalFields.java index 8ff15a8..b6b7635 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeWithAdditionalFields.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeWithAdditionalFields.java @@ -35,8 +35,8 @@ public abstract class INodeWithAdditionalFields extends INode implements LinkedElement { static enum PermissionStatusFormat { MODE(null, 16), - GROUP(MODE.BITS, 25), - USER(GROUP.BITS, 23); + GROUP(MODE.BITS, 24), + USER(GROUP.BITS, 24); final LongBitFormat BITS; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
