Repository: hbase Updated Branches: refs/heads/branch-1.0 5f7eae809 -> b7b703818
HBASE-12774 Fix the inconsistent permission checks for bulkloading. (Srikanth Srungarapu) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b7b70381 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b7b70381 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b7b70381 Branch: refs/heads/branch-1.0 Commit: b7b7038188045b5bc8a1d944e49344ae5f227716 Parents: 5f7eae8 Author: Enis Soztutar <[email protected]> Authored: Wed Jan 21 17:03:55 2015 -0800 Committer: Enis Soztutar <[email protected]> Committed: Wed Jan 21 17:06:16 2015 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/security/access/AccessController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b7b70381/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java index 8e00afc..9955a8a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java @@ -1936,7 +1936,7 @@ public class AccessController extends BaseMasterAndRegionObserver } /** - * Verifies user has WRITE privileges on + * Verifies user has CREATE privileges on * the Column Families involved in the bulkLoadHFile * request. Specific Column Write privileges are presently * ignored. @@ -1993,11 +1993,11 @@ public class AccessController extends BaseMasterAndRegionObserver PrepareBulkLoadRequest request) throws IOException { RegionCoprocessorEnvironment e = ctx.getEnvironment(); - AuthResult authResult = hasSomeAccess(e, "prePrepareBulkLoad", Action.WRITE); + AuthResult authResult = hasSomeAccess(e, "prePrepareBulkLoad", Action.CREATE); logResult(authResult); if (!authResult.isAllowed()) { throw new AccessDeniedException("Insufficient permissions (table=" + - e.getRegion().getTableDesc().getTableName() + ", action=WRITE)"); + e.getRegion().getTableDesc().getTableName() + ", action=CREATE)"); } } @@ -2013,11 +2013,11 @@ public class AccessController extends BaseMasterAndRegionObserver CleanupBulkLoadRequest request) throws IOException { RegionCoprocessorEnvironment e = ctx.getEnvironment(); - AuthResult authResult = hasSomeAccess(e, "preCleanupBulkLoad", Action.WRITE); + AuthResult authResult = hasSomeAccess(e, "preCleanupBulkLoad", Action.CREATE); logResult(authResult); if (!authResult.isAllowed()) { throw new AccessDeniedException("Insufficient permissions (table=" + - e.getRegion().getTableDesc().getTableName() + ", action=WRITE)"); + e.getRegion().getTableDesc().getTableName() + ", action=CREATE)"); } }
