You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2016/06/15 16:41:50 UTC
ambari git commit: AMBARI-17204: Fix Spark2 thriftserver Ambari
definition bug (Saisai Shao via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk ab23e0713 -> b9e51f564
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/b9e51f56
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9e51f56
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9e51f56
Branch: refs/heads/trunk
Commit: b9e51f564106d8b1f4f6bcf702099aaa2c2dc4ce
Parents: ab23e07
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Wed Jun 15 09:41:40 2016 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Wed Jun 15 09:41:40 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/b9e51f56/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 6925ab5..be99edd 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
@@ -156,7 +156,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:
@@ -167,7 +167,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']