bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow proxy to pass NBD protocol errors downstream; server returns EINVAL/ENOSPC appropriately

Browse Source 
Previously the proxy would just disconnect when it saw an NBD protocol
error, and retry the operation it was in the middle of.

Additionally, the server needs to return the correct error types when
this happens.
This commit is contained in:
Patrick J Cherry
2018-02-08 13:19:51 +00:00
parent 806de13024
commit 8beb3f0af6
4 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/proxy/proxy.c
View File

@@ -618,11 +618,6 @@ int proxy_read_from_upstream( struct proxier* proxy, int state )
goto disconnect;
}
if ( reply->error != 0 ) {
warn( "NBD error returned from upstream: %"PRIu32, reply->error );
goto disconnect;
}
if ( proxy->req_hdr.type == REQUEST_READ ) {
/* Get the read reply data too. */
proxy->rsp.size += proxy->req_hdr.len;

13
src/server/client.c
View File

@@ -391,7 +391,9 @@ int client_request_needs_reply( struct client * client,
request.type, request.flags, request.from, request.len, request.handle
);
/* check it's not out of range */
/* check it's not out of range. NBD protocol requires ENOSPC to be
* returned in this instance
*/
if ( request.from+request.len > client->serve->size) {
warn("write request %"PRIu64"+%"PRIu32" out of range",
request.from, request.len
@@ -399,7 +401,7 @@ int client_request_needs_reply( struct client * client,
if ( request.type == REQUEST_WRITE ) {
client_flush( client, request.len );
}
client_write_reply( client, &request, EPERM ); /* TODO: Change to ERANGE ? */
client_write_reply( client, &request, ENOSPC );
client->disconnect = 0;
return 0;
}
@@ -418,7 +420,12 @@ int client_request_needs_reply( struct client * client,
case REQUEST_FLUSH:
break;
default:
fatal("Unknown request 0x%08X", request.type);
/* NBD prototcol says servers SHOULD return EINVAL to unknown
* commands */
warn("Unknown request 0x%08X", request.type);
client_write_reply( client, &request, EINVAL );
client->disconnect = 0;
return 0;
}
return 1;
}