]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: change optional_yield to null_yield 28152/head
authorAli Maredia <amaredia@redhat.com>
Sat, 8 Jun 2019 21:14:45 +0000 (17:14 -0400)
committerAli Maredia <amaredia@redhat.com>
Mon, 8 Jul 2019 17:28:19 +0000 (13:28 -0400)
In copy_obj_data() in the AtomicObjectProcessor
constructor

Signed-off-by: Ali Maredia <amaredia@redhat.com>
src/rgw/rgw_rados.cc

index 69254e73fa783a1a5687e3fc5d5bcefe11587efc..556aeda9503f656a7d25b531b75283a1d0f87b39 100644 (file)
@@ -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;