You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/09/06 15:22:00 UTC
git commit: HBASE-11896 LoadIncrementalHFiles fails in secure mode if
the namespace is specified (Ashish Singhi and Ted Yu)
Repository: hbase
Updated Branches:
refs/heads/0.98 2d875c92c -> 1f8bbe58d
HBASE-11896 LoadIncrementalHFiles fails in secure mode if the namespace is specified (Ashish Singhi and Ted Yu)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1f8bbe58
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1f8bbe58
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1f8bbe58
Branch: refs/heads/0.98
Commit: 1f8bbe58d43c1b233aa2ca680179dcdd5b8f1ee6
Parents: 2d875c9
Author: Ted Yu <te...@apache.org>
Authored: Sat Sep 6 13:21:46 2014 +0000
Committer: Ted Yu <te...@apache.org>
Committed: Sat Sep 6 13:21:46 2014 +0000
----------------------------------------------------------------------
.../hadoop/hbase/security/access/SecureBulkLoadEndpoint.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1f8bbe58/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 d41ec0c..fcb9270 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
@@ -174,7 +174,6 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
getAccessController().preCleanupBulkLoad(env);
fs.delete(createStagingDir(baseStagingDir,
getActiveUser(),
- env.getRegion().getTableDesc().getTableName(),
new Path(request.getBulkToken()).getName()),
true);
done.run(CleanupBulkLoadResponse.newBuilder().build());
@@ -291,14 +290,14 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
private Path createStagingDir(Path baseDir,
User user,
TableName tableName) throws IOException {
- String randomDir = user.getShortName()+"__"+ tableName +"__"+
+ String tblName = tableName.getNameAsString().replace(":", "_");
+ String randomDir = user.getShortName()+"__"+ tblName +"__"+
(new BigInteger(RANDOM_WIDTH, random).toString(RANDOM_RADIX));
- return createStagingDir(baseDir, user, tableName, randomDir);
+ return createStagingDir(baseDir, user, randomDir);
}
private Path createStagingDir(Path baseDir,
User user,
- TableName tableName,
String randomDir) throws IOException {
Path p = new Path(baseDir, randomDir);
fs.mkdirs(p, PERM_ALL_ACCESS);