ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-15772 HBase masters go offline after kerberization on 2.2.9.0 (dsen)
Date Fri, 08 Apr 2016 15:46:10 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 14b99a8b9 -> e3c1dd114


AMBARI-15772 HBase masters go offline after kerberization on 2.2.9.0 (dsen)


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

Branch: refs/heads/branch-2.2
Commit: e3c1dd1142f8b4a71c9390b2f5ae541c62c2acd7
Parents: 14b99a8
Author: Dmytro Sen <dsen@apache.org>
Authored: Fri Apr 8 18:45:24 2016 +0300
Committer: Dmytro Sen <dsen@apache.org>
Committed: Fri Apr 8 18:45:44 2016 +0300

----------------------------------------------------------------------
 .../AbstractPrepareKerberosServerAction.java        |  4 +---
 .../0.96.0.2.0/package/scripts/params_linux.py      | 16 ----------------
 2 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e3c1dd11/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
index 3a945ad..a549907 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
@@ -96,7 +96,7 @@ public abstract class AbstractPrepareKerberosServerAction extends KerberosServer
       }
 
       try {
-        Set<String> services = new HashSet<String>();
+        Set<String> services = cluster.getServices().keySet();
         Map<String, Set<String>> propertiesToIgnore = null;
 
         // Iterate over the components installed on the current host to get the service and
@@ -135,8 +135,6 @@ public abstract class AbstractPrepareKerberosServerAction extends KerberosServer
                   propertiesToIgnore = gatherPropertiesToIgnore(componentIdentities, propertiesToIgnore);
                 }
               }
-
-              services.add(serviceName);
           } catch (IOException e) {
             String message = String.format("Failed to write index file - %s", identityDataFile.getAbsolutePath());
             LOG.error(message, e);

http://git-wip-us.apache.org/repos/asf/ambari/blob/e3c1dd11/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 2168c22..18f3eb2 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -352,19 +352,3 @@ if has_ranger_admin:
   #For SQLA explicitly disable audit to DB for Ranger
   if xa_audit_db_flavor == 'sqla':
     xa_audit_db_is_enabled = False
-
-# Used to dynamically set the hbase-site props that are referenced during Kerberization
-if security_enabled:
-  if not enable_ranger_hbase: # Default props, no ranger plugin
-    hbase_coprocessor_master_classes = "org.apache.hadoop.hbase.security.access.AccessController"
-    hbase_coprocessor_regionserver_classes = "org.apache.hadoop.hbase.security.access.AccessController"
-    hbase_coprocessor_region_classes = "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.hadoop.hbase.security.access.AccessController"
-  elif xml_configurations_supported: # HDP stack 2.3+ ranger plugin enabled
-    hbase_coprocessor_master_classes = "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor
"
-    hbase_coprocessor_regionserver_classes = "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor"
-    hbase_coprocessor_region_classes = "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor"
-  else: # HDP Stack 2.2 and less / ranger plugin enabled
-    hbase_coprocessor_master_classes = "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor"
-    hbase_coprocessor_regionserver_classes = "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor"
-    hbase_coprocessor_region_classes = "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor"
-


Mime
View raw message