From: Ali Maredia <amaredia@redhat.com>
Date: Sat, 8 Jun 2019 21:14:45 +0000 (-0400)
Subject: rgw: change optional_yield to null_yield
X-Git-Tag: v15.1.0~2269^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=580c0804d92c34aea9ee4bd29ea996c45e10a300;p=ceph.git

rgw: change optional_yield to null_yield

In copy_obj_data() in the AtomicObjectProcessor
constructor

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 69254e73fa7..556aeda9503 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;