You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/18 14:01:47 UTC

[06/24] ambari git commit: AMBARI-21028. The credential cache for livy is messed up (Weiqing Yang via smohanty)

AMBARI-21028. The credential cache for livy is messed up (Weiqing Yang via smohanty)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 704eb5254545bcdb8b7a9a60b2518124e7e4b265
Parents: 9adffcf
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue May 16 19:14:35 2017 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue May 16 19:15:45 2017 -0700

----------------------------------------------------------------------
 .../SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py    | 2 +-
 .../SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/704eb525/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
index 746a98e..f15e747 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
@@ -82,7 +82,7 @@ def execute(configurations={}, parameters={}, host_name=None):
     if host_name is None:
         host_name = socket.getfqdn()
 
-    livyuser = LIVYUSER_DEFAULT
+    livyuser = configurations[SMOKEUSER_KEY]
 
     security_enabled = False
     if SECURITY_ENABLED_KEY in configurations:

http://git-wip-us.apache.org/repos/asf/ambari/blob/704eb525/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
index 44c284f..d69f663 100644
--- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
+++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
@@ -82,7 +82,7 @@ def execute(configurations={}, parameters={}, host_name=None):
     if host_name is None:
         host_name = socket.getfqdn()
 
-    livyuser = LIVYUSER_DEFAULT
+    livyuser = configurations[SMOKEUSER_KEY]
 
     security_enabled = False
     if SECURITY_ENABLED_KEY in configurations: