qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [PULL v2 15/20] block/rbd: report a better error when namespace does not exist
Date: Fri, 24 Jun 2022 17:40:58 +0200	[thread overview]
Message-ID: <20220624154103.185902-16-kwolf@redhat.com> (raw)
In-Reply-To: <20220624154103.185902-1-kwolf@redhat.com>

From: Stefano Garzarella <sgarzare@redhat.com>

If the namespace does not exist, rbd_create() fails with -ENOENT and
QEMU reports a generic "error rbd create: No such file or directory":

    $ qemu-img create rbd:rbd/namespace/image 1M
    Formatting 'rbd:rbd/namespace/image', fmt=raw size=1048576
    qemu-img: rbd:rbd/namespace/image: error rbd create: No such file or directory

Unfortunately rados_ioctx_set_namespace() does not fail if the namespace
does not exist, so let's use rbd_namespace_exists() in qemu_rbd_connect()
to check if the namespace exists, reporting a more understandable error:

    $ qemu-img create rbd:rbd/namespace/image 1M
    Formatting 'rbd:rbd/namespace/image', fmt=raw size=1048576
    qemu-img: rbd:rbd/namespace/image: namespace 'namespace' does not exist

Reported-by: Tingting Mao <timao@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20220517071012.6120-1-sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/rbd.c | 24 ++++++++++++++++++++++++
 meson.build |  6 ++++++
 2 files changed, 30 insertions(+)

diff --git a/block/rbd.c b/block/rbd.c
index 6caf35cbba..f826410f40 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -831,6 +831,26 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
         error_setg_errno(errp, -r, "error opening pool %s", opts->pool);
         goto failed_shutdown;
     }
+
+#ifdef HAVE_RBD_NAMESPACE_EXISTS
+    if (opts->has_q_namespace && strlen(opts->q_namespace) > 0) {
+        bool exists;
+
+        r = rbd_namespace_exists(*io_ctx, opts->q_namespace, &exists);
+        if (r < 0) {
+            error_setg_errno(errp, -r, "error checking namespace");
+            goto failed_ioctx_destroy;
+        }
+
+        if (!exists) {
+            error_setg(errp, "namespace '%s' does not exist",
+                       opts->q_namespace);
+            r = -ENOENT;
+            goto failed_ioctx_destroy;
+        }
+    }
+#endif
+
     /*
      * Set the namespace after opening the io context on the pool,
      * if nspace == NULL or if nspace == "", it is just as we did nothing
@@ -840,6 +860,10 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
     r = 0;
     goto out;
 
+#ifdef HAVE_RBD_NAMESPACE_EXISTS
+failed_ioctx_destroy:
+    rados_ioctx_destroy(*io_ctx);
+#endif
 failed_shutdown:
     rados_shutdown(*cluster);
 out:
diff --git a/meson.build b/meson.build
index 397ca1d60a..a113078f1a 100644
--- a/meson.build
+++ b/meson.build
@@ -1903,6 +1903,12 @@ config_host_data.set('HAVE_GETIFADDRS', cc.has_function('getifaddrs'))
 config_host_data.set('HAVE_OPENPTY', cc.has_function('openpty', dependencies: util))
 config_host_data.set('HAVE_STRCHRNUL', cc.has_function('strchrnul'))
 config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>'))
+if rbd.found()
+  config_host_data.set('HAVE_RBD_NAMESPACE_EXISTS',
+                       cc.has_function('rbd_namespace_exists',
+                                       dependencies: rbd,
+                                       prefix: '#include <rbd/librbd.h>'))
+endif
 if rdma.found()
   config_host_data.set('HAVE_IBV_ADVISE_MR',
                        cc.has_function('ibv_advise_mr',
-- 
2.35.3



  parent reply	other threads:[~2022-06-24 16:02 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-24 15:40 [PULL v2 00/20] Block layer patches Kevin Wolf
2022-06-24 15:40 ` [PULL v2 01/20] block: drop unused bdrv_co_drain() API Kevin Wolf
2022-06-24 15:40 ` [PULL v2 02/20] block: get rid of blk->guest_block_size Kevin Wolf
2022-06-24 15:40 ` [PULL v2 03/20] block: block_dirty_bitmap_merge(): fix error path Kevin Wolf
2022-06-24 15:40 ` [PULL v2 04/20] block: improve block_dirty_bitmap_merge(): don't allocate extra bitmap Kevin Wolf
2022-06-24 15:40 ` [PULL v2 05/20] block: simplify handling of try to merge different sized bitmaps Kevin Wolf
2022-06-24 15:40 ` [PULL v2 06/20] block: Support passing NULL ops to blk_set_dev_ops() Kevin Wolf
2022-06-24 15:40 ` [PULL v2 07/20] block/export: Fix incorrect length passed to vu_queue_push() Kevin Wolf
2022-06-24 15:40 ` [PULL v2 08/20] block/export: Abstract out the logic of virtio-blk I/O process Kevin Wolf
2022-06-24 15:40 ` [PULL v2 09/20] linux-headers: Add vduse.h Kevin Wolf
2022-06-24 15:40 ` [PULL v2 10/20] libvduse: Add VDUSE (vDPA Device in Userspace) library Kevin Wolf
2022-06-27  4:45   ` Markus Armbruster
2022-06-27  8:34     ` Yongji Xie
2022-06-24 15:40 ` [PULL v2 11/20] vduse-blk: Implement vduse-blk export Kevin Wolf
2022-06-24 15:40 ` [PULL v2 12/20] vduse-blk: Add vduse-blk resize support Kevin Wolf
2022-06-24 15:40 ` [PULL v2 13/20] libvduse: Add support for reconnecting Kevin Wolf
2022-06-24 15:40 ` [PULL v2 14/20] qsd: document vduse-blk exports Kevin Wolf
2022-06-24 15:40 ` Kevin Wolf [this message]
2022-06-24 15:40 ` [PULL v2 16/20] block/gluster: correctly set max_pdiscard Kevin Wolf
2022-06-24 15:41 ` [PULL v2 17/20] aio_wait_kick: add missing memory barrier Kevin Wolf
2022-06-24 15:41 ` [PULL v2 18/20] nbd: Drop dead code spotted by Coverity Kevin Wolf
2022-06-24 15:41 ` [PULL v2 19/20] vduse-blk: Add serial option Kevin Wolf
2022-06-24 15:41 ` [PULL v2 20/20] vduse-blk: Add name option Kevin Wolf
2022-06-24 20:38 ` [PULL v2 00/20] Block layer patches Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220624154103.185902-16-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).