Repository: ambari Updated Branches: refs/heads/branch-2.5 b6b8e1c7a -> bf03c8ee2 refs/heads/trunk efd3b5847 -> 645407b65
AMBARI-20397 Zeppelin: Spark2 and Livy2 interpreter config disappear during stack upgrade (r-kamath) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bf03c8ee Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf03c8ee Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf03c8ee Branch: refs/heads/branch-2.5 Commit: bf03c8ee2ce1e678d2f8241244aba8e54bf6b807 Parents: b6b8e1c Author: Renjith Kamath <renjith.kam...@gmail.com> Authored: Tue Mar 14 14:36:12 2017 +0530 Committer: Renjith Kamath <renjith.kam...@gmail.com> Committed: Tue Mar 14 14:36:12 2017 +0530 ---------------------------------------------------------------------- .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bf03c8ee/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index a460aec..38bfeb4 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -309,12 +309,12 @@ class Master(Script): config_data = self.get_interpreter_settings() interpreter_settings = config_data['interpreterSettings'] - if 'spark2-env' in params.config['configurations']: + if 'spark2-defaults' in params.config['configurations']: spark2_config = self.get_spark2_interpreter_config() config_id = spark2_config["id"] interpreter_settings[config_id] = spark2_config - if 'livy2-env' in params.config['configurations']: + if 'livy2-defaults' in params.config['configurations']: livy2_config = self.get_livy2_interpreter_config() config_id = livy2_config["id"] interpreter_settings[config_id] = livy2_config
