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

fdstream: Report error from the I/O thread

Browse Source 
Problem with our error reporting is that the error object is a
thread local variable. That means if there's an error reported
within the I/O thread it gets logged and everything, but later
when the event loop aborts the stream it doesn't see the original
error. So we are left with some generic error. We can do better
if we copy the error message between the threads.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Michal Privoznik 2017-05-29 16:29:36 +02:00
parent 3a2ca2fbe4
commit 0fe4aa149f
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon/stream.c
View File

@ -231,17 +231,23 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque)
int ret;
virNetMessagePtr msg;
virNetMessageError rerr;
virErrorPtr origErr = virSaveLastError();
memset(&rerr, 0, sizeof(rerr));
stream->closed = true;
virStreamEventRemoveCallback(stream->st);
virStreamAbort(stream->st);
if (events & VIR_STREAM_EVENT_HANGUP)
virReportError(VIR_ERR_RPC,
"%s", _("stream had unexpected termination"));
else
virReportError(VIR_ERR_RPC,
"%s", _("stream had I/O failure"));
if (origErr && origErr->code != VIR_ERR_OK) {
virSetError(origErr);
virFreeError(origErr);
} else {
if (events & VIR_STREAM_EVENT_HANGUP)
virReportError(VIR_ERR_RPC,
"%s", _("stream had unexpected termination"));
else
virReportError(VIR_ERR_RPC,
"%s", _("stream had I/O failure"));
}
msg = virNetMessageNew(false);
if (!msg) {

9
src/util/virfdstream.c
View File

@ -106,7 +106,7 @@ struct virFDStreamData {
/* Thread data */
virThreadPtr thread;
virCond threadCond;
int threadErr;
virErrorPtr threadErr;
bool threadQuit;
bool threadAbort;
bool threadDoRead;
@ -123,6 +123,7 @@ virFDStreamDataDispose(void *obj)
virFDStreamDataPtr fdst = obj;
VIR_DEBUG("obj=%p", fdst);
virFreeError(fdst->threadErr);
virFDStreamMsgQueueFree(&fdst->msg);
}
@ -312,8 +313,10 @@ static void virFDStreamEvent(int watch ATTRIBUTE_UNUSED,
return;
}
if (fdst->threadErr)
if (fdst->threadErr) {
events |= VIR_STREAM_EVENT_ERROR;
virSetError(fdst->threadErr);
}
cb = fdst->cb;
cbopaque = fdst->opaque;
@ -641,7 +644,7 @@ virFDStreamThread(void *opaque)
return;
error:
fdst->threadErr = errno;
fdst->threadErr = virSaveLastError();
goto cleanup;
}