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-10040 Falcon service check failed on secured cluster (dsen)
Date Thu, 12 Mar 2015 18:01:48 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8eaadd090 -> 1f260e0a8


AMBARI-10040 Falcon service check failed on secured cluster (dsen)


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

Branch: refs/heads/trunk
Commit: 1f260e0a84662eb3e2ac88a95a980f76bfda0453
Parents: 8eaadd0
Author: Dmytro Sen <dsen@apache.org>
Authored: Thu Mar 12 19:49:07 2015 +0200
Committer: Dmytro Sen <dsen@apache.org>
Committed: Thu Mar 12 20:01:31 2015 +0200

----------------------------------------------------------------------
 .../common-services/FALCON/0.5.0.2.1/package/scripts/params.py     | 1 +
 .../FALCON/0.5.0.2.1/package/scripts/service_check.py              | 2 +-
 .../src/test/python/stacks/2.1/FALCON/test_service_check.py        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1f260e0a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
index 13f97ae..49842fa 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
@@ -92,6 +92,7 @@ hostname = config["hostname"]
 hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
 hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
 hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_name']
+smokeuser_principal =  config['configurations']['cluster-env']['smokeuser_principal_name']
 kinit_path_local = functions.get_kinit_path()
 import functools
 #create partial functions with common arguments for every HdfsDirectory call

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f260e0a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
index bf3b1dd..f76718b 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
@@ -27,7 +27,7 @@ class FalconServiceCheck(Script):
 
     env.set_params(params)
     if params.security_enabled:
-      Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smoke_user}"),
+      Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser_principal}"),
               user=params.smoke_user)
     Execute(format("{falcon_home}/bin/falcon admin -version"),
             user=params.smoke_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f260e0a/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py
index 7258eae..cd6f693 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py
@@ -47,7 +47,7 @@ class TestFalconServer(RMFTestCase):
                        hdp_stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES
     )
-    self.assertResourceCalled('Execute','/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab
ambari-qa',
+    self.assertResourceCalled('Execute','/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab
ambari-qa@EXAMPLE.COM',
                               user='ambari-qa'
     )
     self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon admin -version',


Mime
View raw message