On Mon, Sep 06, 2021 at 10:06:50PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
> ---
> nbd/client-connection.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
Reviewed-by: Eric Blake <ebl...@redhat.com>
>
> 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.29.2
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
