From 5ef7de1184372d0a83c2f651ad599382370e254f Mon Sep 17 00:00:00 2001 From: Ashish Singhi Date: Thu, 4 Sep 2014 19:28:50 +0530 Subject: [PATCH] HBASE-11896 LoadIncrementalHFiles fails in secure mode if the namespace is specified --- .../hbase/security/access/SecureBulkLoadEndpoint.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) 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 07d5bf5..64924dd 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 @@ -172,11 +172,7 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService RpcCallback done) { try { getAccessController().preCleanupBulkLoad(env); - fs.delete(createStagingDir(baseStagingDir, - getActiveUser(), - env.getRegion().getTableDesc().getTableName(), - new Path(request.getBulkToken()).getName()), - true); + fs.delete(createStagingDir(baseStagingDir, new Path(request.getBulkToken()).getName()), true); done.run(CleanupBulkLoadResponse.newBuilder().build()); } catch (IOException e) { ResponseConverter.setControllerException(controller, e); @@ -293,14 +289,11 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService TableName tableName) throws IOException { String randomDir = user.getShortName()+"__"+ tableName +"__"+ (new BigInteger(RANDOM_WIDTH, random).toString(RANDOM_RADIX)); - return createStagingDir(baseDir, user, tableName, randomDir); + return createStagingDir(baseDir, randomDir); } - private Path createStagingDir(Path baseDir, - User user, - TableName tableName, - String randomDir) throws IOException { - Path p = new Path(baseDir, randomDir); + private Path createStagingDir(Path baseDir, String randomDir) throws IOException { + Path p = new Path(baseDir, randomDir.replaceAll(":", "")); fs.mkdirs(p, PERM_ALL_ACCESS); fs.setPermission(p, PERM_ALL_ACCESS); return p; -- 1.9.2.msysgit.0