From 2622fa62afee15ee8df93f61ffe9f381d75b0840 Mon Sep 17 00:00:00 2001 Message-Id: <2622fa62afee15ee8df93f61ffe9f381d75b0840.1378302750.git.minovotn@redhat.com> In-Reply-To: References: From: Asias He Date: Tue, 3 Sep 2013 04:13:58 +0200 Subject: [PATCH 6/6] gluster: Abort on AIO completion failure RH-Author: Asias He Message-id: <1378181638-19087-1-git-send-email-asias@redhat.com> Patchwork-id: 53993 O-Subject: [RHEL6.5 qemu-kvm PATCH] gluster: Abort on AIO completion failure Bugzilla: 997220 RH-Acked-by: Kevin Wolf RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Paolo Bonzini From: Bharata B Rao Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=997220 Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=6237194 Upstream status: In Kevin's block tree. Currently if gluster AIO callback thread fails to notify the QEMU thread about AIO completion, we try graceful recovery by marking the disk drive as inaccessible. This error recovery code is race-prone as found by Asias and Stefan. However as found out by Paolo, this kind of error is impossible and hence simplify the code that handles this error recovery. Signed-off-by: Bharata B Rao Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 5055db47e49a715886024b3387d9004dce4e418b) Conflicts: block/gluster.c --- block/gluster.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) Signed-off-by: Michal Novotny --- block/gluster.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index c94d402..4e70c47 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -410,22 +410,9 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg) /* * Gluster AIO callback thread failed to notify the waiting * QEMU thread about IO completion. - * - * Complete this IO request and make the disk inaccessible for - * subsequent reads and writes. */ - error_report("Gluster failed to notify QEMU about IO completion"); - - qemu_mutex_lock_iothread(); /* We are in gluster thread context */ - acb->common.cb(acb->common.opaque, -EIO); - qemu_aio_release(acb); - s->qemu_aio_count--; - close(s->fds[GLUSTER_FD_READ]); - close(s->fds[GLUSTER_FD_WRITE]); - qemu_aio_set_fd_handler(s->fds[GLUSTER_FD_READ], NULL, NULL, NULL, - NULL, NULL); - bs->drv = NULL; /* Make the disk inaccessible */ - qemu_mutex_unlock_iothread(); + error_report("Gluster AIO completion failed: %s", strerror(errno)); + abort(); } } -- 1.7.11.7