openstack/tripleo-heat-templates
Code Issues Proposed changes

Check for yum lock befor all yum* operations.

Browse Source 
A previous (failed/hanging?) yum process blocks 'yum makecache'
 and 'yum check-update' operations, which leads to timeout during
minor update.

Change-Id: I461c1c722944813493f53f339054f420d6ddbe15
Related-Bug: #1704131
This commit is contained in:
Yurii Prokulevych 2017-12-19 10:10:57 +02:00
parent 3848aea06e
commit bfe876e01c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extraconfig/tasks/yum_update.sh
View File

@ -65,9 +65,11 @@ fi
command_arguments=${command_arguments:-} command_arguments=${command_arguments:-}
# Always ensure yum has full cache # Always ensure yum has full cache
check_for_yum_lock
yum makecache || echo "Yum makecache failed. This can cause failure later on." yum makecache || echo "Yum makecache failed. This can cause failure later on."
# yum check-update exits 100 if updates are available # yum check-update exits 100 if updates are available
check_for_yum_lock
set +e set +e
check_update=$(yum check-update 2>&1) check_update=$(yum check-update 2>&1)
check_update_exit=$? check_update_exit=$?
@ -86,6 +88,7 @@ fi
special_case_ovs_upgrade_if_needed special_case_ovs_upgrade_if_needed
# Resolve any RPM dependency issues before attempting the update # Resolve any RPM dependency issues before attempting the update
check_for_yum_lock
yum_pre_update yum_pre_update
if [[ "$pacemaker_status" == "active" ]] ; then if [[ "$pacemaker_status" == "active" ]] ; then