openstack
/
fuel-library
Code Issues Proposed changes

Merge "Fix piped exit codes expectations and count processing"

This commit is contained in:
Jenkins 2015-10-26 09:54:31 +00:00 committed by Gerrit Code Review
parent bc044a0562 cf02b81f21
commit 7759a70efe
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
files/fuel-ha-utils/ocf/rabbitmq
View File

@ -540,7 +540,6 @@ get_running_nodes() {
get_all_pacemaker_nodes()
{
echo `crm_node -l | awk '{print $2}' | grep -v "^$" | sed -e '/(null)/d'`
return $?
}
# Get alive cluster nodes in visible partition, but the specified one
@ -551,7 +550,6 @@ get_alive_pacemaker_nodes_but()
else
echo `crm_node -l -p | sed -e "s/${1}//g" | sed -e '/(null)/d'`
fi
return $?
}
check_need_join_to() {
@ -1109,13 +1107,14 @@ check_timeouts() {
fi
local count
count=`crm_attribute -N $THIS_PCMK_NODE -l reboot --name $crm_attr_name --query 2>/dev/null | awk '{print $3}' | awk -F "=" '{print $2}' | sed -e '/(null)/d'`
if [ $? -ne 0 ]; then
count=`crm_attribute -N $THIS_PCMK_NODE -l reboot --name $crm_attr_name --query 2>/dev/null`
op_rc=$?
if [ $op_rc -ne 0 ]; then
# the crm_attribute exited with error. In that case most probably it printed garbage
# instead of the number we need. So defensively assume that it is zero.
count=0
fi
count=`echo "${count}" | awk '{print $3}' | awk -F "=" '{print $2}' | sed -e '/(null)/d'`
count=$((count+1))
# There is a slight chance that this piece of code will be executed twice simultaneously.