You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2014/05/23 00:29:40 UTC
git commit: HBASE-11237 Bulk load initiated by user other than hbase
fails
Repository: hbase
Updated Branches:
refs/heads/master 3054c3b9b -> 26387cbf1
HBASE-11237 Bulk load initiated by user other than hbase fails
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/26387cbf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/26387cbf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/26387cbf
Branch: refs/heads/master
Commit: 26387cbf186635c6ccb3fdaf113861e2a05dce5c
Parents: 3054c3b
Author: Jimmy Xiang <jx...@cloudera.com>
Authored: Thu May 22 15:27:34 2014 -0700
Committer: Jimmy Xiang <jx...@cloudera.com>
Committed: Thu May 22 15:27:34 2014 -0700
----------------------------------------------------------------------
.../hadoop/hbase/security/access/SecureBulkLoadEndpoint.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/26387cbf/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java
index b85aa21..7f9fcc9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java
@@ -236,7 +236,11 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
done.run(null);
return;
}
- ugi.addToken(targetfsDelegationToken.getUserToken());
+ Token<?> targetFsToken = targetfsDelegationToken.getUserToken();
+ if (targetFsToken != null && (userToken == null
+ || !targetFsToken.getService().equals(userToken.getService()))) {
+ ugi.addToken(targetFsToken);
+ }
loaded = ugi.doAs(new PrivilegedAction<Boolean>() {
@Override