Updated Branches: refs/heads/trunk 22ff085f1 -> ad26dc34f
AMBARI-2943. Oozie smoke tests fail on Ambari with NPE in Oozie Server. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/ad26dc34 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/ad26dc34 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/ad26dc34 Branch: refs/heads/trunk Commit: ad26dc34f55a82319383831f5b9fd19a88fa111f Parents: 22ff085 Author: Mahadev Konar <[email protected]> Authored: Fri Aug 16 18:04:32 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Fri Aug 16 18:04:38 2013 -0700 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh | 1 + .../stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml | 4 ++-- .../HDPLocal/2.0.5/services/OOZIE/configuration/oozie-site.xml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ad26dc34/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 33b45b2..f27d20f 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 @@ -74,6 +74,7 @@ sed -i "s|nameNode=hdfs://localhost:8020|nameNode=$NAMENODE|g" examples/apps/ma sed -i "s|nameNode=hdfs://localhost:9000|nameNode=$NAMENODE|g" examples/apps/map-reduce/job.properties sed -i "s|jobTracker=localhost:8021|jobTracker=$JOBTRACKER|g" examples/apps/map-reduce/job.properties sed -i "s|jobTracker=localhost:9001|jobTracker=$JOBTRACKER|g" examples/apps/map-reduce/job.properties +sed -i "s|jobTracker=localhost:8032|jobTracker=$JOBTRACKER|g" examples/apps/map-reduce/job.properties sed -i "s|oozie.wf.application.path=hdfs://localhost:9000|oozie.wf.application.path=$NAMENODE|g" examples/apps/map-reduce/job.properties if [[ $security_enabled == "true" ]]; then http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ad26dc34/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml index 5fb49ed..94fe814 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml @@ -31,7 +31,7 @@ <property> <name>oozie.system.id</name> - <value>oozie-${mapreduce.job.user.name}</value> + <value>oozie-${user.name}</value> <description> The Oozie system ID. </description> @@ -133,7 +133,7 @@ <property> <name>oozie.service.WorkflowAppService.system.libpath</name> - <value>/user/${mapreduce.job.user.name}/share/lib</value> + <value>/user/${user.name}/share/lib</value> <description> System library path to use for workflow applications. This path is added to workflow application if their job properties sets http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ad26dc34/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/configuration/oozie-site.xml index 5fb49ed..94fe814 100644 --- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/configuration/oozie-site.xml @@ -31,7 +31,7 @@ <property> <name>oozie.system.id</name> - <value>oozie-${mapreduce.job.user.name}</value> + <value>oozie-${user.name}</value> <description> The Oozie system ID. </description> @@ -133,7 +133,7 @@ <property> <name>oozie.service.WorkflowAppService.system.libpath</name> - <value>/user/${mapreduce.job.user.name}/share/lib</value> + <value>/user/${user.name}/share/lib</value> <description> System library path to use for workflow applications. This path is added to workflow application if their job properties sets
