Repository: ambari Updated Branches: refs/heads/branch-1.6.0 b119d0ffc -> 7cc67c712
AMBARI-5645. Ooozie Service Check fails intermittently. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7cc67c71 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7cc67c71 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7cc67c71 Branch: refs/heads/branch-1.6.0 Commit: 7cc67c712b8eb9e6fe5e7d0659688a92725d6522 Parents: b119d0f Author: Mahadev Konar <[email protected]> Authored: Wed May 14 16:06:23 2014 -0700 Committer: Mahadev Konar <[email protected]> Committed: Wed May 14 16:06:23 2014 -0700 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh | 4 ++-- .../stacks/HDP/2.0.6/services/OOZIE/package/files/oozieSmoke2.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7cc67c71/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 2cb5a7a..ae767e5 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 @@ -39,7 +39,7 @@ function checkOozieJobStatus { act_status=$(IFS='';echo $cmd_output | grep ^Status | cut -d':' -f2 | sed 's| ||g') echo "workflow_status=$act_status" if [ "RUNNING" == "$act_status" ]; then - #increment the couner and get the status again after waiting for 15 secs + #increment the counter and get the status again after waiting for 15 secs sleep 15 (( i++ )) elif [ "SUCCEEDED" == "$act_status" ]; then @@ -90,6 +90,6 @@ cmd="${kinitcmd}source ${oozie_conf_dir}/oozie-env.sh ; /usr/bin/oozie -Doozie.a echo $cmd job_info=`su - ${smoke_test_user} -c "$cmd" | grep "job:"` job_id="`echo $job_info | cut -d':' -f2`" -checkOozieJobStatus "$job_id" +checkOozieJobStatus "$job_id" 15 OOZIE_EXIT_CODE="$?" exit $OOZIE_EXIT_CODE http://git-wip-us.apache.org/repos/asf/ambari/blob/7cc67c71/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/files/oozieSmoke2.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/files/oozieSmoke2.sh b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/files/oozieSmoke2.sh index ade464e..83b99f7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/files/oozieSmoke2.sh +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/files/oozieSmoke2.sh @@ -43,7 +43,7 @@ function checkOozieJobStatus { act_status=$(IFS='';echo $cmd_output | grep ^Status | cut -d':' -f2 | sed 's| ||g') echo "workflow_status=$act_status" if [ "RUNNING" == "$act_status" ]; then - #increment the couner and get the status again after waiting for 15 secs + #increment the counter and get the status again after waiting for 15 secs sleep 15 (( i++ )) elif [ "SUCCEEDED" == "$act_status" ]; then @@ -102,6 +102,6 @@ cmd="${kinitcmd}source ${oozie_conf_dir}/oozie-env.sh ; /usr/bin/oozie -Doozie.a echo $cmd job_info=`su - ${smoke_test_user} -c "$cmd" | grep "job:"` job_id="`echo $job_info | cut -d':' -f2`" -checkOozieJobStatus "$job_id" +checkOozieJobStatus "$job_id" 15 OOZIE_EXIT_CODE="$?" exit $OOZIE_EXIT_CODE
