ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gau...@apache.org
Subject [2/2] ambari git commit: AMBARI-16788: Add HDFS keytab on RegionServer node(gautam)
Date Wed, 25 May 2016 05:43:30 GMT
AMBARI-16788: Add HDFS keytab on RegionServer node(gautam)


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

Branch: refs/heads/branch-2.4
Commit: 328b5d238182e91b9df36f22a518cfe97f1a3af8
Parents: cf725e1
Author: Gautam Borad <gautam@apache.org>
Authored: Mon May 23 15:35:40 2016 +0530
Committer: Gautam Borad <gautam@apache.org>
Committed: Wed May 25 11:13:20 2016 +0530

----------------------------------------------------------------------
 .../HBASE/0.96.0.2.0/package/scripts/hbase_master.py            | 2 +-
 .../HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py      | 2 +-
 .../HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py      | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/328b5d23/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py
index 840411f..b15be5b 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py
@@ -82,7 +82,7 @@ class HbaseMasterDefault(HbaseMaster):
     import params
     env.set_params(params)
     self.configure(env) # for security
-    setup_ranger_hbase(upgrade_type=upgrade_type)
+    setup_ranger_hbase(upgrade_type=upgrade_type, service_name="hbase-master")
     hbase_service('master', action = 'start')
     
   def stop(self, env, upgrade_type=None):

http://git-wip-us.apache.org/repos/asf/ambari/blob/328b5d23/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
index 4001912..563577f 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
@@ -85,7 +85,7 @@ class HbaseRegionServerDefault(HbaseRegionServer):
     import params
     env.set_params(params)
     self.configure(env) # for security
-    setup_ranger_hbase(upgrade_type=upgrade_type)
+    setup_ranger_hbase(upgrade_type=upgrade_type, service_name="hbase-regionserver")
     hbase_service( 'regionserver',
       action = 'start'
     )

http://git-wip-us.apache.org/repos/asf/ambari/blob/328b5d23/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
index abb47e5..0d73e39 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
@@ -19,12 +19,11 @@ limitations under the License.
 """
 from resource_management.core.logger import Logger
 
-def setup_ranger_hbase(upgrade_type=None):
+def setup_ranger_hbase(upgrade_type=None, service_name="hbase-master"):
   import params
 
   if params.has_ranger_admin:
 
-
     stack_version = None
 
     if upgrade_type is not None:
@@ -35,7 +34,7 @@ def setup_ranger_hbase(upgrade_type=None):
     else:
       Logger.info("HBase: Setup ranger: command retry not enabled thus skipping if ranger
admin is down !")
 
-    if params.xml_configurations_supported and params.enable_ranger_hbase and params.xa_audit_hdfs_is_enabled:
+    if params.xml_configurations_supported and params.enable_ranger_hbase and params.xa_audit_hdfs_is_enabled
and service_name == 'hbase-master' :
       params.HdfsResource("/ranger/audit",
                          type="directory",
                          action="create_on_execute",


Mime
View raw message