SLIDER-440. Add an env.sh file to limit post install changes to conf dir (fix hdp-conf vs. conf)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/937e0a7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/937e0a7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/937e0a7c Branch: refs/heads/feature/SLIDER-158_slider_diagnostic_option Commit: 937e0a7ce5941b88f024b3e7f6e6503f356274c2 Parents: 39e8365 Author: Sumit Mohanty <[email protected]> Authored: Tue Sep 23 10:30:03 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Tue Sep 23 10:30:03 2014 -0700 ---------------------------------------------------------------------- slider-assembly/src/conf-hdp/slider-client.xml | 28 ++++++++++++--------- slider-assembly/src/conf-hdp/slider-env.sh | 26 +++++++++++++++++++ 2 files changed, 42 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/937e0a7c/slider-assembly/src/conf-hdp/slider-client.xml ---------------------------------------------------------------------- diff --git a/slider-assembly/src/conf-hdp/slider-client.xml b/slider-assembly/src/conf-hdp/slider-client.xml index f844106..8e87e53 100644 --- a/slider-assembly/src/conf-hdp/slider-client.xml +++ b/slider-assembly/src/conf-hdp/slider-client.xml @@ -19,42 +19,46 @@ <!-- Properties set here are picked up in the client. - They are not passed to the AM -though the filesystem - binding details (URL And principal) are added to the - hbase-site.xml file when a cluster is created. --> <configuration> <property> - <name>yarn.log-aggregation-enable</name> - <value>true</value> + <name>slider.zookeeper.quorum</name> + <value>localhost:2181</value> </property> - <property> <name>slider.yarn.queue</name> <value>default</value> <description>YARN queue for the Application Master</description> </property> - - + + <property> + <name>yarn.log-aggregation-enable</name> + <value>true</value> + </property> + +<!-- <property> <name>yarn.application.classpath</name> <value> /etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/* </value> </property> - -<!-- <property> <name>yarn.resourcemanager.address</name> - <value>master:8032</value> + <value>@RM-ADDR</value> </property> <property> + <name>yarn.resourcemanager.scheduler.address</name> + <value>@RM-SCHEDULER-ADDR</value> + </property> + + <property> <name>fs.defaultFS</name> - <value>hdfs://master:9090</value> + <value>@FILESYSTEM</value> </property> <property> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/937e0a7c/slider-assembly/src/conf-hdp/slider-env.sh ---------------------------------------------------------------------- diff --git a/slider-assembly/src/conf-hdp/slider-env.sh b/slider-assembly/src/conf-hdp/slider-env.sh new file mode 100644 index 0000000..f3ec550 --- /dev/null +++ b/slider-assembly/src/conf-hdp/slider-env.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# this is the shell script to start Slider deploying an application +# Usage: slider <action> <commands> + +# The env variable SLIDER_JVM_OPTS can be used to override +# the default JVM opts + +export JAVA_HOME=${JAVA_HOME} +export HADOOP_CONF_DIR=${HADOOP_CONF_DIR} \ No newline at end of file
