All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, armbru@redhat.com, hreitz@redhat.com,
	kwolf@redhat.com, vsementsov@virtuozzo.com, eblake@redhat.com
Subject: [PATCH v4 3/7] nbd/client-connection: improve error message of cancelled attempt
Date: Mon, 13 Dec 2021 16:32:36 +0100	[thread overview]
Message-ID: <20211213153240.480103-4-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20211213153240.480103-1-vsementsov@virtuozzo.com>

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 nbd/client-connection.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nbd/client-connection.c b/nbd/client-connection.c
index 722998c985..2bda42641d 100644
--- a/nbd/client-connection.c
+++ b/nbd/client-connection.c
@@ -351,8 +351,15 @@ nbd_co_establish_connection(NBDClientConnection *conn, NBDExportInfo *info,
             if (conn->err) {
                 error_propagate(errp, error_copy(conn->err));
             } else {
-                error_setg(errp,
-                           "Connection attempt cancelled by other operation");
+                /*
+                 * The only possible case here is cancelling by open_timer
+                 * during nbd_open(). So, the error message is for that case.
+                 * If we have more use cases, we can refactor
+                 * nbd_co_establish_connection_cancel() to take an additional
+                 * parameter cancel_reason, that would be passed than to the
+                 * caller of cancelled nbd_co_establish_connection().
+                 */
+                error_setg(errp, "Connection attempt cancelled by timeout");
             }
 
             return NULL;
-- 
2.31.1



  parent reply	other threads:[~2021-12-13 15:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-13 15:32 [PATCH v4 0/7] nbd reconnect on open Vladimir Sementsov-Ogievskiy
2021-12-13 15:32 ` [PATCH v4 1/7] nbd: allow reconnect on open, with corresponding new options Vladimir Sementsov-Ogievskiy
2021-12-13 20:50   ` Eric Blake
2021-12-13 15:32 ` [PATCH v4 2/7] nbd/client-connection: nbd_co_establish_connection(): return real error Vladimir Sementsov-Ogievskiy
2021-12-13 15:32 ` Vladimir Sementsov-Ogievskiy [this message]
2021-12-13 15:32 ` [PATCH v4 4/7] iotests.py: add qemu_tool_popen() Vladimir Sementsov-Ogievskiy
2021-12-20 11:45   ` Nikta Lapshin
2021-12-13 15:32 ` [PATCH v4 5/7] For qemu_io* functions support --image-opts argument, which conflicts with -f argument from qemu_io_args Vladimir Sementsov-Ogievskiy
2021-12-20 11:46   ` Nikta Lapshin
2021-12-13 15:32 ` [PATCH v4 6/7] Add qemu-io Popen constructor wrapper. To be used in the following new test commit Vladimir Sementsov-Ogievskiy
2021-12-20 11:47   ` Nikta Lapshin
2021-12-13 15:32 ` [PATCH v4 7/7] iotests: add nbd-reconnect-on-open test Vladimir Sementsov-Ogievskiy
2021-12-20 11:48   ` Nikta Lapshin
2021-12-21 14:17 ` [PATCH v4 0/7] nbd reconnect on open Vladimir Sementsov-Ogievskiy

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=20211213153240.480103-4-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=hreitz@redhat.com \
    --cc=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.