From c0233c4abb9f99304e3d82272bbb4385086bbfc0 Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Fri, 6 Jan 2017 15:16:32 -0500 Subject: [PATCH] rgw_rados: sanitize dout print in GWRados::get_obj_iterate_cb(...) We cannot assume pbl may be deferenced. Per review, move the dout print into the r < 0 condition--since it's now an error, make it's trace level 0. Signed-off-by: Matt Benjamin --- src/rgw/rgw_rados.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 13afc5bc4454c..8757baf1c5786 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -1,4 +1,3 @@ - // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab @@ -9908,9 +9907,10 @@ int RGWRados::get_obj_iterate_cb(RGWObjectCtx *ctx, RGWObjState *astate, io_ctx.locator_set_key(key); r = io_ctx.aio_operate(oid, c, &op, NULL); - ldout(cct, 20) << "rados->aio_operate r=" << r << " bl.length=" << pbl->length() << dendl; - if (r < 0) - goto done_err; + if (r < 0) { + ldout(cct, 0) << "rados->aio_operate r=" << r << dendl; + goto done_err; + } // Flush data to client if there is any r = flush_read_list(d); -- 2.39.5