You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2017/01/02 00:45:03 UTC
[45/50] [abbrv] hadoop git commit: HDFS-11275. Check groupEntryIndex
and throw a helpful exception on failures when removing ACL.
HDFS-11275. Check groupEntryIndex and throw a helpful exception on failures when removing ACL.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e7699575
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e7699575
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e7699575
Branch: refs/heads/YARN-5085
Commit: e76995755629579c7f83fbb417afde20ea747980
Parents: a4f6665
Author: Xiao Chen <xi...@apache.org>
Authored: Thu Dec 29 10:36:50 2016 -0800
Committer: Xiao Chen <xi...@apache.org>
Committed: Thu Dec 29 10:36:50 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7699575/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
index 25ca09b..efededd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.namenode;
+import com.google.common.base.Preconditions;
import org.apache.hadoop.fs.permission.AclEntry;
import org.apache.hadoop.fs.permission.AclEntryScope;
import org.apache.hadoop.fs.permission.AclEntryType;
@@ -221,7 +222,10 @@ class FSDirAclOp {
int groupEntryIndex = Collections.binarySearch(
featureEntries, groupEntryKey,
AclTransformation.ACL_ENTRY_COMPARATOR);
- assert groupEntryIndex >= 0;
+ Preconditions.checkPositionIndex(groupEntryIndex, featureEntries.size(),
+ "Invalid group entry index after binary-searching inode: " +
+ inode.getFullPathName() + "(" + inode.getId() + ") "
+ + "with featureEntries:" + featureEntries);
FsAction groupPerm = featureEntries.get(groupEntryIndex).getPermission();
FsPermission newPerm = new FsPermission(perm.getUserAction(), groupPerm,
perm.getOtherAction(), perm.getStickyBit());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org