Updated Branches: refs/heads/trunk 7c3bab94d -> f1dc8beb7
AMBARI-2879. Oozie failed at smoke test in secured cluster. (swagle) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/f1dc8beb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f1dc8beb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f1dc8beb Branch: refs/heads/trunk Commit: f1dc8beb76d922c653f2012dee241658c7a7b0b2 Parents: 7c3bab9 Author: Siddharth Wagle <[email protected]> Authored: Mon Aug 12 18:03:58 2013 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Mon Aug 12 18:03:58 2013 -0700 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-nagios/files/check_oozie_status.sh | 2 +- ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh | 2 +- .../src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f1dc8beb/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_oozie_status.sh ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_oozie_status.sh b/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_oozie_status.sh index de1a2f5..bfd9d75 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_oozie_status.sh +++ b/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_oozie_status.sh @@ -20,7 +20,7 @@ # # # OOZIE_URL is of the form http://<hostname>:<port>/oozie -HOST=$1 +HOST=`echo $1 | tr '[:upper:]' '[:lower:]'` PORT=$2 JAVA_HOME=$3 SEC_ENABLED=$4 http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f1dc8beb/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh b/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh index ceb452b..bc7a464 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh +++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh @@ -66,7 +66,7 @@ export kinit_path_local=$9 export OOZIE_EXIT_CODE=0 export JOBTRACKER=`getValueFromField ${hadoop_conf_dir}/mapred-site.xml mapred.job.tracker` export NAMENODE=`getValueFromField ${hadoop_conf_dir}/core-site.xml fs.default.name` -export OOZIE_SERVER=`getValueFromField ${oozie_conf_dir}/oozie-site.xml oozie.base.url` +export OOZIE_SERVER=`getValueFromField ${oozie_conf_dir}/oozie-site.xml oozie.base.url | tr '[:upper:]' '[:lower:]'` export OOZIE_EXAMPLES_DIR=`rpm -ql oozie-client | grep 'oozie-examples.tar.gz$' | xargs dirname` cd $OOZIE_EXAMPLES_DIR http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f1dc8beb/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh b/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh index 406dbe0..33b45b2 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh +++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh @@ -65,7 +65,7 @@ export NNHOST=$8 export OOZIE_EXIT_CODE=0 export JOBTRACKER=`getValueFromField ${hadoop_conf_dir}/yarn-site.xml yarn.resourcemanager.address` export NAMENODE=`getValueFromField ${hadoop_conf_dir}/core-site.xml fs.defaultFS` -export OOZIE_SERVER=`getValueFromField ${oozie_conf_dir}/oozie-site.xml oozie.base.url` +export OOZIE_SERVER=`getValueFromField ${oozie_conf_dir}/oozie-site.xml oozie.base.url | tr '[:upper:]' '[:lower:]'` export OOZIE_EXAMPLES_DIR=`rpm -ql oozie-client | grep 'oozie-examples.tar.gz$' | xargs dirname` cd $OOZIE_EXAMPLES_DIR
