|
 |
619821 |
From 22e47c104ff73885357a0be7b94270f3955427ea Mon Sep 17 00:00:00 2001
|
|
|
619821 |
From: Jeffrey Cody <jcody@redhat.com>
|
|
|
619821 |
Date: Tue, 17 Jan 2017 19:51:31 +0100
|
|
|
619821 |
Subject: [PATCH 2/3] gluster: Correctly propagate errors when volume isn't
|
|
|
619821 |
accessible
|
|
|
619821 |
|
|
|
619821 |
RH-Author: Jeffrey Cody <jcody@redhat.com>
|
|
|
619821 |
Message-id: <963a714d4eae919df79e2031e02c77af5a8697e2.1484682588.git.jcody@redhat.com>
|
|
|
619821 |
Patchwork-id: 73256
|
|
|
619821 |
O-Subject: [RHEL-7.4 qemu-kvm 2/3] gluster: Correctly propagate errors when volume isn't accessible
|
|
|
619821 |
Bugzilla: 1151859
|
|
|
619821 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
619821 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
619821 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
619821 |
|
|
|
619821 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
619821 |
|
|
|
619821 |
The docs for glfs_init suggest that the function sets errno on every
|
|
|
619821 |
failure. In fact it doesn't. As other functions such as
|
|
|
619821 |
qemu_gluster_open() in the gluster block code report their errors based
|
|
|
619821 |
on this fact we need to make sure that errno is set on each failure.
|
|
|
619821 |
|
|
|
619821 |
This fixes a crash of qemu-img/qemu when a gluster brick isn't
|
|
|
619821 |
accessible from given host while the server serving the volume
|
|
|
619821 |
description is.
|
|
|
619821 |
|
|
|
619821 |
Thread 1 (Thread 0x7ffff7fba740 (LWP 203880)):
|
|
|
619821 |
#0 0x00007ffff77673f8 in glfs_lseek () from /usr/lib64/libgfapi.so.0
|
|
|
619821 |
#1 0x0000555555574a68 in qemu_gluster_getlength ()
|
|
|
619821 |
#2 0x0000555555565742 in refresh_total_sectors ()
|
|
|
619821 |
#3 0x000055555556914f in bdrv_open_common ()
|
|
|
619821 |
#4 0x000055555556e8e8 in bdrv_open ()
|
|
|
619821 |
#5 0x000055555556f02f in bdrv_open_image ()
|
|
|
619821 |
#6 0x000055555556e5f6 in bdrv_open ()
|
|
|
619821 |
#7 0x00005555555c5775 in bdrv_new_open ()
|
|
|
619821 |
#8 0x00005555555c5b91 in img_info ()
|
|
|
619821 |
#9 0x00007ffff62c9c05 in __libc_start_main () from /lib64/libc.so.6
|
|
|
619821 |
#10 0x00005555555648ad in _start ()
|
|
|
619821 |
|
|
|
619821 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
619821 |
(cherry picked from commit 4557117d9eed8cadc360aec23b42fc39a7011864)
|
|
|
619821 |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
619821 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
619821 |
---
|
|
|
619821 |
block/gluster.c | 7 ++++++-
|
|
|
619821 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
619821 |
|
|
|
619821 |
diff --git a/block/gluster.c b/block/gluster.c
|
|
|
619821 |
index 248a031..5266dce 100644
|
|
|
619821 |
--- a/block/gluster.c
|
|
|
619821 |
+++ b/block/gluster.c
|
|
|
619821 |
@@ -224,6 +224,11 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename,
|
|
|
619821 |
"volume=%s image=%s transport=%s", gconf->server,
|
|
|
619821 |
gconf->port, gconf->volname, gconf->image,
|
|
|
619821 |
gconf->transport);
|
|
|
619821 |
+
|
|
|
619821 |
+ /* glfs_init sometimes doesn't set errno although docs suggest that */
|
|
|
619821 |
+ if (errno == 0)
|
|
|
619821 |
+ errno = EINVAL;
|
|
|
619821 |
+
|
|
|
619821 |
goto out;
|
|
|
619821 |
}
|
|
|
619821 |
return glfs;
|
|
|
619821 |
@@ -484,7 +489,7 @@ static int qemu_gluster_create(const char *filename,
|
|
|
619821 |
|
|
|
619821 |
glfs = qemu_gluster_init(gconf, filename, errp);
|
|
|
619821 |
if (!glfs) {
|
|
|
619821 |
- ret = -EINVAL;
|
|
|
619821 |
+ ret = -errno;
|
|
|
619821 |
goto out;
|
|
|
619821 |
}
|
|
|
619821 |
|
|
|
619821 |
--
|
|
|
619821 |
1.8.3.1
|
|
|
619821 |
|