[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/7] nbd/client-connection: improve error message of cancelled att
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PULL 3/7] nbd/client-connection: improve error message of cancelled attempt |
Date: |
Wed, 22 Dec 2021 19:52:44 +0100 |
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
- [PULL 0/7] NBD patches, Vladimir Sementsov-Ogievskiy, 2021/12/22
- [PULL 1/7] nbd: allow reconnect on open, with corresponding new options, Vladimir Sementsov-Ogievskiy, 2021/12/22
- [PULL 3/7] nbd/client-connection: improve error message of cancelled attempt,
Vladimir Sementsov-Ogievskiy <=
- [PULL 2/7] nbd/client-connection: nbd_co_establish_connection(): return real error, Vladimir Sementsov-Ogievskiy, 2021/12/22
- [PULL 5/7] iotests.py: add and use qemu_io_wrap_args(), Vladimir Sementsov-Ogievskiy, 2021/12/22
- [PULL 4/7] iotests.py: add qemu_tool_popen(), Vladimir Sementsov-Ogievskiy, 2021/12/22
- [PULL 6/7] iotests.py: add qemu_io_popen(), Vladimir Sementsov-Ogievskiy, 2021/12/22
- [PULL 7/7] iotests: add nbd-reconnect-on-open test, Vladimir Sementsov-Ogievskiy, 2021/12/22
- Re: [PULL 0/7] NBD patches, Richard Henderson, 2021/12/22