nbd/client-connection: improve error message of cancelled attempt
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Mon, 6 Sep 2021 19:06:50 +0000 (22:06 +0300)
committerVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Tue, 21 Dec 2021 13:52:19 +0000 (14:52 +0100)
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
nbd/client-connection.c

index 722998c985a4c4bfc7632b2b163e844663e2a266..2bda42641dc8d0619b423fd914c438552955ff16 100644 (file)
@@ -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;