| Message ID | 20180523102419.28665-2-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | NBD export bitmaps | expand |
On 05/23/2018 05:24 AM, Vladimir Sementsov-Ogievskiy wrote: > Return code = 1 doesn't mean that we parsed base:allocation. Move > trace point to appropriate place. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > nbd/server.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > @@ -768,10 +771,10 @@ static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *meta, > } > > if (strncmp(query, "allocation", alen) == 0) { > + trace_nbd_negotiate_meta_query_parse("base:allocation"); > meta->base_allocation = true; > } It's probably worth tracing even when we successfully skip the request, as in: if (strncmp...) { trace_nbd_negotiate_meta_query_parse("base:allocation"); meta->base_allocation = true; } else { trace_nbd_negotiate_meta_query_skip("unrecognized request %s", query); }
diff --git a/nbd/server.c b/nbd/server.c index 9e1f227178..7584ff7dcc 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -741,7 +741,10 @@ static int nbd_negotiate_send_meta_context(NBDClient *client, * the current name, after the 'base:' portion has been stripped. * * Return -errno on I/O error, 0 if option was completely handled by - * sending a reply about inconsistent lengths, or 1 on success. */ + * sending a reply about inconsistent lengths, or 1 on success. + * + * Note: return code = 1 doesn't mean that we've parsed "base:allocation" + * namespace. It only means that there are no errors.*/ static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *meta, uint32_t len, Error **errp) { @@ -768,10 +771,10 @@ static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *meta, } if (strncmp(query, "allocation", alen) == 0) { + trace_nbd_negotiate_meta_query_parse("base:allocation"); meta->base_allocation = true; } - trace_nbd_negotiate_meta_query_parse("base:allocation"); return 1; }
Return code = 1 doesn't mean that we parsed base:allocation. Move trace point to appropriate place. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- nbd/server.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)