arch-run: migration: properly handle crashing outgoing QEMU
PATCH 1/1 arch-run: migration: properly handle crashing outgoing QEMU
When outgoing (live) QEMU crashes or times out during migration, we currently hang forever.
This is because we don't exit the loop querying migration state when QMP communication fails.
Add proper error handling to the loop and exit when QMP communication fails for whatever reason.
Signed-off-by Nico Boehr <[email protected]>
--- scripts/arch-run.bash | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
scripts/arch-run.bash +8 -2
@@ -162,8 +162,14 @@ run_migration () migstatus=`qmp ${qmp1} '"query-migrate"' | grep return` while ! grep -q '"completed"' <<<"$migstatus" ; do sleep 1 - migstatus=`qmp ${qmp1} '"query-migrate"' | grep return` - if grep -q '"failed"' <<<"$migstatus" ; then + if ! migstatus=`qmp ${qmp1} '"query-migrate"'`; then + echo "ERROR: Querying migration state failed." >&2 + echo > ${fifo} + qmp ${qmp2} '"quit"'> ${qmpout2} 2>/dev/null + return 2 + fi + migstatus=`grep return <<<"$migstatus"` + if grep -q '"failed"' <<<"$migstatus"; then echo "ERROR: Migration failed." >&2 echo > ${fifo} qmp ${qmp1} '"quit"'> ${qmpout1} 2>/dev/null
Signature · 1 line
2.41.0