ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-17204: Fix Spark2 thriftserver Ambari definition bug (Saisai Shao via jluniya)
Date Wed, 15 Jun 2016 16:43:36 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 aee1c92e2 -> 7ebe5625d


AMBARI-17204: Fix Spark2 thriftserver Ambari definition bug (Saisai Shao via jluniya)


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

Branch: refs/heads/branch-2.4
Commit: 7ebe5625dd1ef24e06be7c05e9377d025c2d910a
Parents: aee1c92
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Wed Jun 15 09:41:40 2016 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Wed Jun 15 09:43:32 2016 -0700

----------------------------------------------------------------------
 .../common-services/SPARK2/2.0.0/package/scripts/params.py       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ebe5625/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
index 3316f78..be464e4 100755
--- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
@@ -159,7 +159,7 @@ if 'nm_hosts' in config['clusterHostInfo'] and len(config['clusterHostInfo']['nm
   # use local mode when there's only one nodemanager
   spark_thrift_master = "local[4]"
 
-if has_spark_thriftserver and 'spark-thrift-sparkconf' in config['configurations']:
+if has_spark_thriftserver and 'spark2-thrift-sparkconf' in config['configurations']:
   spark_thrift_sparkconf = config['configurations']['spark2-thrift-sparkconf']
   spark_thrift_cmd_opts_properties = config['configurations']['spark2-env']['spark_thrift_cmd_opts']
   if is_hive_installed:
@@ -170,7 +170,7 @@ if has_spark_thriftserver and 'spark-thrift-sparkconf' in config['configurations
     })
     spark_hive_properties.update(config['configurations']['spark2-hive-site-override'])
 
-  if 'spark-thrift-fairscheduler' in config['configurations'] and 'fairscheduler_content'
in config['configurations']['spark2-thrift-fairscheduler']:
+  if 'spark2-thrift-fairscheduler' in config['configurations'] and 'fairscheduler_content'
in config['configurations']['spark2-thrift-fairscheduler']:
     spark_thrift_fairscheduler_content = config['configurations']['spark2-thrift-fairscheduler']['fairscheduler_content']
 
 default_fs = config['configurations']['core-site']['fs.defaultFS']


Mime
View raw message