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/10/03 05:53:04 UTC
git commit: HBASE-12164 Check for presence of user Id in
SecureBulkLoadEndpoint#secureBulkLoadHFiles() is inaccurate
Repository: hbase
Updated Branches:
refs/heads/0.98 a3cfd5233 -> 0409d22a1
HBASE-12164 Check for presence of user Id in SecureBulkLoadEndpoint#secureBulkLoadHFiles() is inaccurate
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0409d22a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0409d22a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0409d22a
Branch: refs/heads/0.98
Commit: 0409d22a15d6656d0368b6343b7b3349d22bdd77
Parents: a3cfd52
Author: Ted Yu <te...@apache.org>
Authored: Fri Oct 3 03:52:52 2014 +0000
Committer: Ted Yu <te...@apache.org>
Committed: Fri Oct 3 03:52:52 2014 +0000
----------------------------------------------------------------------
.../hbase/security/access/SecureBulkLoadEndpoint.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0409d22a/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 8f7d842..7c00a82 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
@@ -197,7 +197,7 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
}
Token userToken = null;
- if (request.getFsToken().hasIdentifier() && request.getFsToken().hasPassword()) {
+ if (userProvider.isHadoopSecurityEnabled()) {
userToken = new Token(request.getFsToken().getIdentifier().toByteArray(), request.getFsToken()
.getPassword().toByteArray(), new Text(request.getFsToken().getKind()), new Text(
request.getFsToken().getService()));
@@ -212,6 +212,7 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
//for mini cluster testing
ResponseConverter.setControllerException(controller,
new DoNotRetryIOException("User token cannot be null"));
+ done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(false).build());
return;
}
@@ -222,7 +223,7 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
bypass = region.getCoprocessorHost().preBulkLoadHFile(familyPaths);
} catch (IOException e) {
ResponseConverter.setControllerException(controller, e);
- done.run(null);
+ done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(false).build());
return;
}
}
@@ -239,7 +240,7 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
targetfsDelegationToken.acquireDelegationToken(fs);
} catch (IOException e) {
ResponseConverter.setControllerException(controller, e);
- done.run(null);
+ done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(false).build());
return;
}
Token<?> targetFsToken = targetfsDelegationToken.getUserToken();
@@ -283,7 +284,7 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
loaded = region.getCoprocessorHost().postBulkLoadHFile(familyPaths, loaded);
} catch (IOException e) {
ResponseConverter.setControllerException(controller, e);
- done.run(null);
+ done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(false).build());
return;
}
}