External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: fix race on stream abort/finish and server side abort

Browse Source 
Stream abort/finish can hang because we can receive abort message
from server and yet sent abort/finish message to server. The latter
will not be answered ever because after server sends abort message
it forgets the stream and messages for unknown stream are simply ignored.

We check for stream error at the very beginning of remoteStreamFinish/remoteStreamAbort
but stream error can be set after the check in another thread operating
on stream. Let's check for stream error under client lock similar
to what's done in [1].

[1] 833b901cb: stream: Check for stream EOF

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2019-02-07 15:58:39 +03:00 committed by Michal Privoznik
parent df2b31ffea
commit a5445a3706
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/rpc/virnetclient.c
View File

@ -2216,20 +2216,26 @@ int virNetClientSendWithReplyStream(virNetClientPtr client,
virNetMessagePtr msg,
virNetClientStreamPtr st)
{
int ret;
int ret = -1;
virObjectLock(client);
/* Other thread might have already received
* stream EOF so we don't want sent anything.
* Server won't respond anyway.
*/
if (virNetClientStreamEOF(st)) {
virObjectUnlock(client);
return 0;
if (virNetClientStreamRaiseError(st))
goto cleanup;
/* Check for EOF only if we are going to wait for incoming data */
if (!msg->bufferLength && virNetClientStreamEOF(st)) {
ret = 0;
goto cleanup;
}
ret = virNetClientSendInternal(client, msg, true, false);
if (virNetClientSendInternal(client, msg, true, false) < 0)
goto cleanup;
ret = 0;
cleanup:
virObjectUnlock(client);
if (ret < 0)
return -1;
return 0;
return ret;
}

2
src/rpc/virnetclientstream.c
View File

@ -350,7 +350,7 @@ int virNetClientStreamSendPacket(virNetClientStreamPtr st,
if (virNetMessageEncodePayloadRaw(msg, NULL, 0) < 0)
goto error;
if (virNetClientSendWithReply(client, msg) < 0)
if (virNetClientSendWithReplyStream(client, msg, st) < 0)
goto error;
}