hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nkey...@apache.org
Subject hbase git commit: HBASE-14580 Make the HBaseMiniCluster compliant with Kerberos
Date Tue, 13 Oct 2015 09:34:15 GMT
Repository: hbase
Updated Branches:
  refs/heads/master b63155eac -> 657078b35


HBASE-14580 Make the HBaseMiniCluster compliant with Kerberos


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/657078b3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/657078b3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/657078b3

Branch: refs/heads/master
Commit: 657078b353f215ab02ff7ac2b449006090c0c971
Parents: b63155e
Author: Nicolas Liochon <nkeywal@gmail.com>
Authored: Tue Oct 13 11:33:40 2015 +0200
Committer: Nicolas Liochon <nkeywal@gmail.com>
Committed: Tue Oct 13 11:33:40 2015 +0200

----------------------------------------------------------------------
 .../test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/657078b3/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 7c07cd4..2cfafb9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -3370,7 +3370,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
   /**
    * This method clones the passed <code>c</code> configuration setting a new
    * user into the clone.  Use it getting new instances of FileSystem.  Only
-   * works for DistributedFileSystem.
+   * works for DistributedFileSystem w/o Kerberos.
    * @param c Initial configuration
    * @param differentiatingSuffix Suffix to differentiate this user from others.
    * @return A new configuration instance with a different user set into it.
@@ -3380,7 +3380,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
     final String differentiatingSuffix)
   throws IOException {
     FileSystem currentfs = FileSystem.get(c);
-    if (!(currentfs instanceof DistributedFileSystem)) {
+    if (!(currentfs instanceof DistributedFileSystem) || User.isHBaseSecurityEnabled(c))
{
       return User.getCurrent();
     }
     // Else distributed filesystem.  Make a new instance per daemon.  Below


Mime
View raw message