Skip to content

pvpanic: Fix race condition when checking QMP events #4416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heywji wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pvpanic: Fix race condition when checking QMP events #4416

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions qemu/tests/pvpanic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import aexpect
from avocado.utils.wait import wait_for
from virttest import error_context, utils_misc, utils_test
from virttest.qemu_monitor import MonitorSocketError

LOG_JOB = logging.getLogger("avocado.test")

Expand Down Expand Up @@ -51,11 +52,18 @@ def check_qmp_events(vm, event_names, timeout=360):
"""

def _do_check(vm, event_names):
for name in event_names:
if vm.monitor.get_event(name):
LOG_JOB.info("Receive qmp %s event notification", name)
vm.monitor.clear_event(name)
return True
try:
events = vm.monitor.get_events()
for event in events:
if event.get("event") in event_names:
LOG_JOB.info(
"Receive qmp %s event notification", event.get("event")
)
vm.monitor.clear_event(event.get("event"))
return True
except MonitorSocketError:
LOG_JOB.warning("QMP connection closed")
return None
return False

LOG_JOB.info("Try to get qmp events %s in %s seconds!", event_names, timeout)
Expand Down