External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 08:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: agent: ignore garbage while waiting for sync reply

Browse Source 
After sync is sent we can receive garbare and this is not error.
Consider next regular case:

1. libvirtd sends sync
2. qga sends partial sync reply and die
3. libvirtd sends sync
4. qga sends sync reply
5. libvirtd receives garbage
  (half of first reply and second reply together)

We should handle this situation as it is recoverable.
Next sync can succeed. Let's report reply is NULL,
it will be converted to the VIR_ERR_AGENT_UNSYNCED
which signals client to retry.
This commit is contained in:
Nikolay Shirokovskiy 2016-09-16 13:35:33 +03:00 committed by Michal Privoznik
parent 4fd25421e3
commit 832d48d790
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_agent.c
View File

@ -81,6 +81,8 @@ struct _qemuAgentMessage {
* fatal error occurred on the monitor channel
*/
bool finished;
/* true for sync command */
bool sync;
};
@ -311,8 +313,16 @@ qemuAgentIOProcessLine(qemuAgentPtr mon,
VIR_DEBUG("Line [%s]", line);
if (!(obj = virJSONValueFromString(line)))
if (!(obj = virJSONValueFromString(line))) {
/* receiving garbage on sync is regular situation */
if (msg && msg->sync) {
VIR_DEBUG("Received garbage on sync");
msg->finished = 1;
return 0;
}
goto cleanup;
}
if (obj->type != VIR_JSON_TYPE_OBJECT) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@ -939,6 +949,7 @@ qemuAgentGuestSync(qemuAgentPtr mon)
return -1;
sync_msg.txLength = strlen(sync_msg.txBuffer);
sync_msg.sync = true;
VIR_DEBUG("Sending guest-sync command with ID: %llu", id);