瀏覽代碼

AMBARI-2943. Oozie smoke tests fail on Ambari with NPE in Oozie Server. (mahadev)

Mahadev Konar 11 年之前
父節點
當前提交
ad26dc34f5

+ 1 - 0
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

+ 2 - 2
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

+ 2 - 2
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