From 580c0804d92c34aea9ee4bd29ea996c45e10a300 Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Sat, 8 Jun 2019 17:14:45 -0400 Subject: [PATCH] rgw: change optional_yield to null_yield In copy_obj_data() in the AtomicObjectProcessor constructor Signed-off-by: Ali Maredia --- src/rgw/rgw_rados.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 69254e73fa783..556aeda9503f6 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -4882,9 +4882,11 @@ int RGWRados::copy_obj_data(RGWObjectCtx& obj_ctx, rgw::BlockingAioThrottle aio(cct->_conf->rgw_put_obj_min_window_size); using namespace rgw::putobj; + // do not change the null_yield in the initialization of this AtomicObjectProcessor + // it causes crashes in the ragweed tests AtomicObjectProcessor processor(&aio, this, dest_bucket_info, &dest_placement, dest_bucket_info.owner, obj_ctx, - dest_obj, olh_epoch, tag, dpp, y); + dest_obj, olh_epoch, tag, dpp, null_yield); int ret = processor.prepare(y); if (ret < 0) return ret; -- 2.39.5