Check for yum lock befor all yum* operations.
A previous (failed/hanging?) yum process blocks 'yum makecache'
and 'yum check-update' operations, which leads to timeout during
minor update.
Change-Id: I461c1c722944813493f53f339054f420d6ddbe15
Cherry picked from commit bfe876e01c
Related-Bug: #1704131
This commit is contained in:
parent
0648011d9f
commit
2ae1f02e4e
|
@ -65,9 +65,11 @@ fi
|
|||
command_arguments=${command_arguments:-}
|
||||
|
||||
# Always ensure yum has full cache
|
||||
check_for_yum_lock
|
||||
yum makecache || echo "Yum makecache failed. This can cause failure later on."
|
||||
|
||||
# yum check-update exits 100 if updates are available
|
||||
check_for_yum_lock
|
||||
set +e
|
||||
check_update=$(yum check-update 2>&1)
|
||||
check_update_exit=$?
|
||||
|
@ -86,6 +88,7 @@ fi
|
|||
special_case_ovs_upgrade_if_needed
|
||||
|
||||
# Resolve any RPM dependency issues before attempting the update
|
||||
check_for_yum_lock
|
||||
yum_pre_update
|
||||
|
||||
if [[ "$pacemaker_status" == "active" ]] ; then
|
||||
|
|
Loading…
Reference in New Issue