Repository: accumulo Updated Branches: refs/heads/1.6 f98408233 -> 7f1a55b9e refs/heads/master e595c1725 -> 60969b3e0
ACCUMULO-3289 Add logging to discern between application and network pauses for bulkImportFiles. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7f1a55b9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7f1a55b9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7f1a55b9 Branch: refs/heads/1.6 Commit: 7f1a55b9ed6aff523c5f66c93692242e9fd86e37 Parents: f984082 Author: Josh Elser <els...@apache.org> Authored: Wed Nov 12 16:19:16 2014 -0800 Committer: Josh Elser <els...@apache.org> Committed: Wed Nov 12 16:19:16 2014 -0800 ---------------------------------------------------------------------- .../org/apache/accumulo/server/client/ClientServiceHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f1a55b9/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java index ebea064..fe17a62 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java +++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java @@ -181,7 +181,7 @@ public class ClientServiceHandler implements ClientService.Iface { public void grantTablePermission(TInfo tinfo, TCredentials credentials, String user, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException { String tableId = checkTableId(instance, tableName, TableOperation.PERMISSION); - String namespaceId = Tables.getNamespaceId(instance, tableId); + String namespaceId = Tables.getNamespaceId(instance, tableId); security.grantTablePermission(credentials, user, tableId, TablePermission.getPermissionById(permission), namespaceId); } @@ -202,7 +202,7 @@ public class ClientServiceHandler implements ClientService.Iface { public void revokeTablePermission(TInfo tinfo, TCredentials credentials, String user, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException { String tableId = checkTableId(instance, tableName, TableOperation.PERMISSION); - String namespaceId = Tables.getNamespaceId(instance, tableId); + String namespaceId = Tables.getNamespaceId(instance, tableId); security.revokeTablePermission(credentials, user, tableId, TablePermission.getPermissionById(permission), namespaceId); } @@ -277,6 +277,7 @@ public class ClientServiceHandler implements ClientService.Iface { try { if (!security.canPerformSystemActions(credentials)) throw new AccumuloSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); + log.debug("Got request to bulk import files to table(" + tableId + "): " + files); return transactionWatcher.run(Constants.BULK_ARBITRATOR_TYPE, tid, new Callable<List<String>>() { @Override public List<String> call() throws Exception {
