Repository: ambari Updated Branches: refs/heads/trunk e5d17bc75 -> 0ee059daf
AMBARI-19250 Change default Spark configuration property in Oozie configuration settings (Ping Wang via dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ee059da Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ee059da Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ee059da Branch: refs/heads/trunk Commit: 0ee059dafef75a757c0fb4c97b14cb1f66e1d486 Parents: e5d17bc Author: Di Li <d...@apache.org> Authored: Fri Jan 13 10:42:15 2017 -0500 Committer: Di Li <d...@apache.org> Committed: Fri Jan 13 10:42:15 2017 -0500 ---------------------------------------------------------------------- .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 3 +++ .../common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0ee059da/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py index 4d09d94..f9c608e 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py @@ -68,6 +68,9 @@ hadoop_conf_dir = conf_select.get_hadoop_conf_dir() hadoop_bin_dir = stack_select.get_hadoop_dir("bin") hadoop_lib_home = stack_select.get_hadoop_dir("lib") +#spark_conf +spark_conf_dir = format("{stack_root}/current/spark-client/conf") + #hadoop params if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE,stack_version_formatted): stack_version = None http://git-wip-us.apache.org/repos/asf/ambari/blob/0ee059da/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml index cdb6972..dd4cfc9 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml @@ -19,7 +19,7 @@ <configuration supports_final="true"> <property> <name>oozie.service.SparkConfigurationService.spark.configurations</name> - <value>*=spark-conf</value> + <value>*={{spark_conf_dir}}</value> <description> Comma separated AUTHORITY=SPARK_CONF_DIR, where AUTHORITY is the HOST:PORT of the ResourceManager of a YARN cluster. The wildcard '*'
