V22
This commit is contained in:
1 parent
45e1d972f7
commit
7f8577b70b
1 file changed
+72
-12
+72
-12
@@ -37,6 +37,8 @@ ERROR_DETAILS=()
|
|||||||
FULL_UPGRADE_HINTS=()
|
FULL_UPGRADE_HINTS=()
|
||||||
LXC_RESULT_DETAILS=()
|
LXC_RESULT_DETAILS=()
|
||||||
VM_RESULT_DETAILS=()
|
VM_RESULT_DETAILS=()
|
||||||
|
FAILED_LXC_IDS=()
|
||||||
|
FAILED_VM_IDS=()
|
||||||
BACKUP_WAITED="no"
|
BACKUP_WAITED="no"
|
||||||
REBOOT_BLOCKED_BY_BACKUP="no"
|
REBOOT_BLOCKED_BY_BACKUP="no"
|
||||||
HOST_OK="not-run"
|
HOST_OK="not-run"
|
||||||
@@ -181,6 +183,28 @@ check_vm_full_upgrade_hint() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
mark_guest_failed() {
|
||||||
|
local type="$1" id="$2" x
|
||||||
|
if [[ "$type" == "LXC" ]]; then
|
||||||
|
for x in "${FAILED_LXC_IDS[@]}"; do [[ "$x" == "$id" ]] && return; done
|
||||||
|
FAILED_LXC_IDS+=("$id")
|
||||||
|
else
|
||||||
|
for x in "${FAILED_VM_IDS[@]}"; do [[ "$x" == "$id" ]] && return; done
|
||||||
|
FAILED_VM_IDS+=("$id")
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
guest_failed() {
|
||||||
|
local type="$1" id="$2" x
|
||||||
|
if [[ "$type" == "LXC" ]]; then
|
||||||
|
for x in "${FAILED_LXC_IDS[@]}"; do [[ "$x" == "$id" ]] && return 0; done
|
||||||
|
else
|
||||||
|
for x in "${FAILED_VM_IDS[@]}"; do [[ "$x" == "$id" ]] && return 0; done
|
||||||
|
fi
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
add_guest_result() {
|
add_guest_result() {
|
||||||
local type="$1" id="$2" name="$3" status="$4"
|
local type="$1" id="$2" name="$3" status="$4"
|
||||||
local line="$id ($name): $status"
|
local line="$id ($name): $status"
|
||||||
@@ -760,6 +784,7 @@ update_lxc() {
|
|||||||
|
|
||||||
if ! pct start "$id"; then
|
if ! pct start "$id"; then
|
||||||
log "CT $id ($name): Start fehlgeschlagen."
|
log "CT $id ($name): Start fehlgeschlagen."
|
||||||
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
@@ -787,6 +812,7 @@ update_lxc() {
|
|||||||
if ! pct exec "$id" -- bash -lc 'apt-get update'; then
|
if ! pct exec "$id" -- bash -lc 'apt-get update'; then
|
||||||
log "CT $id ($name): apt-get update FEHLER."
|
log "CT $id ($name): apt-get update FEHLER."
|
||||||
add_error "CT $id ($name): apt-get update fehlgeschlagen"
|
add_error "CT $id ($name): apt-get update fehlgeschlagen"
|
||||||
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
@@ -806,6 +832,7 @@ update_lxc() {
|
|||||||
printf '%s\n' "$simulation"
|
printf '%s\n' "$simulation"
|
||||||
log "CT $id ($name): upgrade Simulation FEHLER."
|
log "CT $id ($name): upgrade Simulation FEHLER."
|
||||||
add_error "CT $id ($name): upgrade Simulation fehlgeschlagen"
|
add_error "CT $id ($name): upgrade Simulation fehlgeschlagen"
|
||||||
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
@@ -822,6 +849,7 @@ update_lxc() {
|
|||||||
if [[ -z "$upgraded" || -z "$installed" || -z "$removed" ]]; then
|
if [[ -z "$upgraded" || -z "$installed" || -z "$removed" ]]; then
|
||||||
log "CT $id ($name): Simulation konnte nicht ausgewertet werden."
|
log "CT $id ($name): Simulation konnte nicht ausgewertet werden."
|
||||||
add_error "CT $id ($name): upgrade Simulation konnte nicht ausgewertet werden"
|
add_error "CT $id ($name): upgrade Simulation konnte nicht ausgewertet werden"
|
||||||
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
if [[ "$started_by_us" == "yes" ]]; then
|
if [[ "$started_by_us" == "yes" ]]; then
|
||||||
@@ -841,6 +869,7 @@ update_lxc() {
|
|||||||
then
|
then
|
||||||
log "CT $id ($name): upgrade FEHLER."
|
log "CT $id ($name): upgrade FEHLER."
|
||||||
add_error "CT $id ($name): upgrade fehlgeschlagen"
|
add_error "CT $id ($name): upgrade fehlgeschlagen"
|
||||||
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
@@ -869,6 +898,7 @@ update_lxc() {
|
|||||||
if ! pct stop "$id"; then
|
if ! pct stop "$id"; then
|
||||||
log "FEHLER: CT $id ($name) konnte nicht gestoppt werden."
|
log "FEHLER: CT $id ($name) konnte nicht gestoppt werden."
|
||||||
LXC_OK=$((LXC_OK - 1))
|
LXC_OK=$((LXC_OK - 1))
|
||||||
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
fi
|
fi
|
||||||
@@ -1040,6 +1070,7 @@ update_vm() {
|
|||||||
|
|
||||||
if ! qm start "$id"; then
|
if ! qm start "$id"; then
|
||||||
log "VM $id ($name): Start fehlgeschlagen."
|
log "VM $id ($name): Start fehlgeschlagen."
|
||||||
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
@@ -1057,6 +1088,7 @@ update_vm() {
|
|||||||
qm stop "$id" || true
|
qm stop "$id" || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
@@ -1073,6 +1105,7 @@ update_vm() {
|
|||||||
qm shutdown "$id" --timeout 60 || qm stop "$id"
|
qm shutdown "$id" --timeout 60 || qm stop "$id"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
@@ -1085,6 +1118,7 @@ update_vm() {
|
|||||||
qm shutdown "$id" --timeout 60 || qm stop "$id"
|
qm shutdown "$id" --timeout 60 || qm stop "$id"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
@@ -1108,6 +1142,7 @@ update_vm() {
|
|||||||
if ! vm_exec "$id" 'apt-get update'; then
|
if ! vm_exec "$id" 'apt-get update'; then
|
||||||
log "VM $id ($name): apt-get update FEHLER."
|
log "VM $id ($name): apt-get update FEHLER."
|
||||||
add_error "VM $id ($name): apt-get update fehlgeschlagen"
|
add_error "VM $id ($name): apt-get update fehlgeschlagen"
|
||||||
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
@@ -1144,6 +1179,7 @@ update_vm() {
|
|||||||
printf '%s\n' "$simulation"
|
printf '%s\n' "$simulation"
|
||||||
log "VM $id ($name): upgrade Simulation FEHLER."
|
log "VM $id ($name): upgrade Simulation FEHLER."
|
||||||
add_error "VM $id ($name): upgrade Simulation fehlgeschlagen"
|
add_error "VM $id ($name): upgrade Simulation fehlgeschlagen"
|
||||||
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
if [[ "$started_by_us" == "yes" ]]; then
|
if [[ "$started_by_us" == "yes" ]]; then
|
||||||
@@ -1168,6 +1204,7 @@ update_vm() {
|
|||||||
printf '%s\n' "$simulation"
|
printf '%s\n' "$simulation"
|
||||||
log "VM $id ($name): upgrade Simulation konnte nicht ausgewertet werden."
|
log "VM $id ($name): upgrade Simulation konnte nicht ausgewertet werden."
|
||||||
add_error "VM $id ($name): upgrade Simulation konnte nicht ausgewertet werden"
|
add_error "VM $id ($name): upgrade Simulation konnte nicht ausgewertet werden"
|
||||||
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
if [[ "$started_by_us" == "yes" ]]; then
|
if [[ "$started_by_us" == "yes" ]]; then
|
||||||
@@ -1189,6 +1226,7 @@ update_vm() {
|
|||||||
then
|
then
|
||||||
log "VM $id ($name): upgrade FEHLER."
|
log "VM $id ($name): upgrade FEHLER."
|
||||||
add_error "VM $id ($name): upgrade fehlgeschlagen"
|
add_error "VM $id ($name): upgrade fehlgeschlagen"
|
||||||
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
@@ -1217,6 +1255,7 @@ update_vm() {
|
|||||||
if ! qm stop "$id"; then
|
if ! qm stop "$id"; then
|
||||||
log "FEHLER: VM $id ($name) konnte nicht gestoppt werden."
|
log "FEHLER: VM $id ($name) konnte nicht gestoppt werden."
|
||||||
VM_OK=$((VM_OK - 1))
|
VM_OK=$((VM_OK - 1))
|
||||||
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
fi
|
fi
|
||||||
@@ -1257,7 +1296,11 @@ reboot_pending_guests() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
log "CT $id ($name): automatischer Neustart ..."
|
log "CT $id ($name): automatischer Neustart ..."
|
||||||
if pct reboot "$id" --timeout 60; then
|
if if guest_failed "LXC" "$id"; then
|
||||||
|
log "CT $id: Neustart übersprungen - dieser Gast hatte einen Update-Fehler."
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
pct reboot "$id" --timeout 60; then
|
||||||
log "CT $id ($name): Neustart erfolgreich ausgelöst."
|
log "CT $id ($name): Neustart erfolgreich ausgelöst."
|
||||||
else
|
else
|
||||||
log "FEHLER: CT $id ($name) konnte nicht neu gestartet werden."
|
log "FEHLER: CT $id ($name) konnte nicht neu gestartet werden."
|
||||||
@@ -1277,7 +1320,11 @@ reboot_pending_guests() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
log "VM $id ($name): automatischer Neustart ..."
|
log "VM $id ($name): automatischer Neustart ..."
|
||||||
if qm reboot "$id" >/dev/null 2>&1; then
|
if if guest_failed "VM" "$id"; then
|
||||||
|
log "VM $id: Neustart übersprungen - dieser Gast hatte einen Update-Fehler."
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
qm reboot "$id" >/dev/null 2>&1; then
|
||||||
log "VM $id ($name): Neustart erfolgreich ausgelöst."
|
log "VM $id ($name): Neustart erfolgreich ausgelöst."
|
||||||
else
|
else
|
||||||
log "FEHLER: VM $id ($name) konnte nicht neu gestartet werden."
|
log "FEHLER: VM $id ($name) konnte nicht neu gestartet werden."
|
||||||
@@ -1430,18 +1477,31 @@ log "============================================================"
|
|||||||
|
|
||||||
if [[ "$MODE" == "update" ]]; then
|
if [[ "$MODE" == "update" ]]; then
|
||||||
if (( ERRORS > 0 )); then
|
if (( ERRORS > 0 )); then
|
||||||
MAIL_STATUS_DETAIL="Keine automatischen Neustarts ausgeführt, weil $ERRORS Fehler im Update-Lauf aufgetreten sind."
|
|
||||||
|
|
||||||
if [[ -z "$ONLY_CT" && -z "$ONLY_VM" && "$HOST_REBOOT_REQUIRED" == "yes" ]]; then
|
|
||||||
log ""
|
log ""
|
||||||
log "Host-Neustart erforderlich, aber automatischer Neustart wird NICHT ausgeführt."
|
log "$ERRORS Fehler im Update-Lauf: nur betroffene Gäste werden vom Neustart ausgeschlossen."
|
||||||
log "Grund: $ERRORS Fehler im Update-Lauf."
|
|
||||||
|
if [[ "$HOST_OK" == "yes" && "$HOST_REBOOT_REQUIRED" == "yes" && "$AUTO_REBOOT_HOST" == "yes" && "$NO_REBOOT" != "yes" ]]
|
||||||
|
then
|
||||||
|
log "Host-Update war erfolgreich und Host-Neustart ist erforderlich."
|
||||||
|
log "Host-Neustart bleibt erlaubt; fehlerhafte Gäste werden dadurch nicht separat neu gestartet."
|
||||||
|
|
||||||
|
if backup_allows_reboot; then
|
||||||
|
HOST_REBOOT_SCHEDULED="yes"
|
||||||
|
MAIL_STATUS_DETAIL="$ERRORS Fehler vorhanden. Host-Update selbst war erfolgreich; Host-Neustart in 1 Minute geplant."
|
||||||
|
sync
|
||||||
|
shutdown -r +1 "Proxmox Guest Updater: Neustart nach erfolgreichem Systemupdate"
|
||||||
|
else
|
||||||
|
HOST_REBOOT_SCHEDULED="no"
|
||||||
|
MAIL_STATUS_DETAIL="$ERRORS Fehler vorhanden. Host-Neustart wegen laufendem Proxmox-Backup zurückgestellt."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
local_pending=$(( ${#LXC_REBOOT_PENDING[@]} + ${#VM_REBOOT_PENDING[@]} ))
|
||||||
|
reboot_pending_guests
|
||||||
|
if (( local_pending > 0 )); then
|
||||||
|
MAIL_STATUS_DETAIL="$ERRORS Fehler vorhanden. Nur erfolgreiche Gäste mit Neustartbedarf wurden verarbeitet; fehlerhafte Gäste wurden nicht neu gestartet."
|
||||||
|
else
|
||||||
|
MAIL_STATUS_DETAIL="$ERRORS Fehler vorhanden. Kein Neustart erfolgreicher Gäste erforderlich."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( ${#LXC_REBOOT_PENDING[@]} > 0 || ${#VM_REBOOT_PENDING[@]} > 0 )); then
|
|
||||||
log ""
|
|
||||||
log "Gast-Neustart erforderlich, aber automatische Gast-Neustarts werden NICHT ausgeführt."
|
|
||||||
log "Grund: $ERRORS Fehler im Update-Lauf."
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
elif [[ -n "$ONLY_CT" || -n "$ONLY_VM" ]]; then
|
elif [[ -n "$ONLY_CT" || -n "$ONLY_VM" ]]; then
|
||||||
|
|||||||
Reference in new issue
Block a user