rgw/notification: Support generating multisite sync delete events.

Signed-off-by: kchheda3 <kchheda3@bloomberg.net>

diff --git a/doc/radosgw/s3-notification-compatibility.rst b/doc/radosgw/s3-notification-compatibility.rst
index 31b218456bd8e744d3c0a0ca394f388f4ed2dec1..b6bf460f6f4e73725ca419277d5c4ea4fc84f28a 100644 (file)
--- a/doc/radosgw/s3-notification-compatibility.rst
+++ b/doc/radosgw/s3-notification-compatibility.rst
@@ -66,67 +66,76 @@ However, the ``requestParameters.sourceIPAddress`` field will be sent empty.
 Event Types
 -----------
 
-+--------------------------------------------------------+-----------------------------------------+
-| Event                                                  | Note                                    |
-+========================================================+=========================================+
-| ``s3:ObjectCreated:*``                                 | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectCreated:Put``                               | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectCreated:Post``                              | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectCreated:Copy``                              | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectCreated:CompleteMultipartUpload``           | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectRemoved:*``                                 | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectRemoved:Delete``                            | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectRemoved:DeleteMarkerCreated``               | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectLifecycle:Expiration:Current``              | Ceph extension                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectLifecycle:Expiration:NonCurrent``           | Ceph extension                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectLifecycle:Expiration:DeleteMarker``         | Ceph extension                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectLifecycle:Expiration:AbortMultipartUpload`` | Ceph extension                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectLifecycle:Transition:Current``              | Ceph extension                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectLifecycle:Transition:NonCurrent``           | Ceph extension                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:LifecycleExpiration:*``                           | Supported. Equivalent to: s3:LifecycleExpiration:Delete, s3:LifecycleExpiration:DeleteMarkerCreated|
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:LifecycleExpiration:Delete``                      | Supported. Equivalent to: s3:ObjectLifecycle:Expiration:Current.|
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:LifecycleExpiration:DeleteMarkerCreated``         | Supported. Equivalent to: s3:ObjectLifecycle:Expiration:DeleteMarker.|
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:LifecycleTransition``                             | Supported. Equivalent to: s3:ObjectLifecycle:Transition:Current|
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectSynced:*``                                  | Ceph extension                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectSynced:Create``                             | Ceph Extension                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectSynced:Delete``                             | Defined, Ceph extension (not generated) |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectSynced:DeletionMarkerCreated``              | Defined, Ceph extension (not generated) |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:Replication:*``                                   | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:Replication:Create``                              | Supported                               |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:Replication:Delete``                              | Defined, Supported (not generated)      |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:Replication:DeletionMarkerCreated``               | Defined, Supported (not generated)      |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectRestore:Post``                              | Not applicable                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ObjectRestore:Complete``                          | Not applicable                          |
-+--------------------------------------------------------+-----------------------------------------+
-| ``s3:ReducedRedundancyLostObject``                     | Not applicable                          |
-+--------------------------------------------------------+-----------------------------------------+
++--------------------------------------------------------+-------------------------------------------+
+| Event                                                  | Note                                      |
++========================================================+===========================================+
+| ``s3:ObjectCreated:*``                                 | Supported                                 |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectCreated:Put``                               | Supported                                 |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectCreated:Post``                              | Supported                                 |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectCreated:Copy``                              | Supported                                 |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectCreated:CompleteMultipartUpload``           | Supported                                 |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectRemoved:*``                                 | Supported                                 |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectRemoved:Delete``                            | Supported                                 |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectRemoved:DeleteMarkerCreated``               | Supported                                 |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectLifecycle:Expiration:Current``              | Ceph extension                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectLifecycle:Expiration:NonCurrent``           | Ceph extension                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectLifecycle:Expiration:DeleteMarker``         | Ceph extension                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectLifecycle:Expiration:AbortMultipartUpload`` | Ceph extension                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectLifecycle:Transition:Current``              | Ceph extension                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectLifecycle:Transition:NonCurrent``           | Ceph extension                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:LifecycleExpiration:*``                           | Supported. Equivalent to                  |
+|                                                        | s3:LifecycleExpiration:Delete,            |
+|                                                        | s3:LifecycleExpiration:DeleteMarkerCreated|
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:LifecycleExpiration:Delete``                      | Supported. Equivalent to                  |
+|                                                        | s3:ObjectLifecycle:Expiration:Current     |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:LifecycleExpiration:DeleteMarkerCreated``         | Supported. Equivalent to                  |
+|                                                        | s3:ObjectLifecycle:Expiration:DeleteMarker|
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:LifecycleTransition``                             | Supported. Equivalent to                  |
+|                                                        | s3:ObjectLifecycle:Transition:Current     |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectSynced:*``                                  | Ceph extension                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectSynced:Create``                             | Ceph Extension                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectSynced:Delete``                             | Ceph extension                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectSynced:DeletionMarkerCreated``              | Defined, Ceph extension (not generated)   |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:Replication:*``                                   | Supported. Equivalent to                  |
+|                                                        | s3:ObjectSynced:Create,                   |
+|                                                        | s3:ObjectSynced:Delete                    |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:Replication:Create``                              | Supported. Equivalent to                  |
+|                                                        | s3:ObjectSynced:Create                    |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:Replication:Delete``                              | Supported. Equivalent to                  |
+|                                                        | s3:ObjectSynced:Delete                    |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:Replication:DeletionMarkerCreated``               | Defined, Supported (not generated)        |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectRestore:Post``                              | Not applicable                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ObjectRestore:Complete``                          | Not applicable                            |
++--------------------------------------------------------+-------------------------------------------+
+| ``s3:ReducedRedundancyLostObject``                     | Not applicable                            |
++--------------------------------------------------------+-------------------------------------------+
 
 .. note:: 
 

diff --git a/src/rgw/driver/rados/rgw_cr_rados.cc b/src/rgw/driver/rados/rgw_cr_rados.cc
index 7e4164ff7dde50fb7af60685b320aead111b9f66..a717b971a89609307f50486c26465b10b9321d3a 100644 (file)
--- a/src/rgw/driver/rados/rgw_cr_rados.cc
+++ b/src/rgw/driver/rados/rgw_cr_rados.cc
@@ -717,6 +717,55 @@ int RGWRadosBILogTrimCR::request_complete()
   return r;
 }
 
+int send_sync_notification(const DoutPrefixProvider* dpp,
+                           rgw::sal::RadosStore* store,
+                           rgw::sal::Bucket* bucket,
+                           rgw::sal::Object* obj,
+                           const rgw::sal::Attrs& attrs,
+                           uint64_t obj_size,
+                           const rgw::notify::EventTypeList& event_types) {
+  // send notification that object was successfully synced
+  std::string user_id = "rgw sync";
+  std::string req_id = "0";
+
+  RGWObjTags obj_tags;
+  auto iter = attrs.find(RGW_ATTR_TAGS);
+  if (iter != attrs.end()) {
+    try {
+      auto it = iter->second.cbegin();
+      obj_tags.decode(it);
+    } catch (buffer::error& err) {
+      ldpp_dout(dpp, 1) << "ERROR: " << __func__
+                        << ": caught buffer::error couldn't decode TagSet "
+                        << dendl;
+      return -EIO;
+    }
+  }
+  rgw::notify::reservation_t notify_res(dpp, store, obj, nullptr, bucket,
+                                        user_id, bucket->get_tenant(), req_id,
+                                        null_yield);
+  int ret = rgw::notify::publish_reserve(dpp, *store->svc()->site, event_types,
+                                         notify_res, &obj_tags);
+  if (ret < 0) {
+    ldpp_dout(dpp, 1) << "ERROR: reserving notification failed, with error: "
+                      << ret << dendl;
+  } else {
+    std::string etag;
+    const auto iter = attrs.find(RGW_ATTR_ETAG);
+    if (iter != attrs.end()) {
+      etag = iter->second.to_str();
+    }
+    ret =
+        rgw::notify::publish_commit(obj, obj_size, ceph::real_clock::now(),
+                                    etag, obj->get_instance(), notify_res, dpp);
+    if (ret < 0) {
+      ldpp_dout(dpp, 1) << "ERROR: publishing notification failed, with error: "
+                        << ret << dendl;
+    }
+  }
+  return ret;
+}
+
 int RGWAsyncFetchRemoteObj::_send_request(const DoutPrefixProvider *dpp)
 {
   RGWObjectCtx obj_ctx(store);
@@ -784,56 +833,9 @@ int RGWAsyncFetchRemoteObj::_send_request(const DoutPrefixProvider *dpp)
   } else {
       // r >= 0
       if (bytes_transferred) {
-        // send notification that object was successfully synced
-        std::string user_id = "rgw sync";
-        std::string req_id = "0";
-
-        RGWObjTags obj_tags;
-        auto iter = attrs.find(RGW_ATTR_TAGS);
-        if (iter != attrs.end()) {
-          try {
-            auto it = iter->second.cbegin();
-            obj_tags.decode(it);
-          } catch (buffer::error& err) {
-            ldpp_dout(dpp, 1)
-                << "ERROR: " << __func__
-                << ": caught buffer::error couldn't decode TagSet " << dendl;
-          }
-        }
-
-        // NOTE: we create a mutable copy of bucket.get_tenant as the
-        // get_notification function expects a std::string&, not const
-        std::string tenant(dest_bucket.get_tenant());
-
-        std::unique_ptr<rgw::sal::Notification> notify =
-            store->get_notification(dpp, &dest_obj, nullptr,
-                                    {rgw::notify::ObjectSyncedCreate,
-                                     rgw::notify::ReplicationCreate},
-                                    &dest_bucket, user_id, tenant, req_id,
-                                    null_yield);
-
-        auto notify_res =
-            static_cast<rgw::sal::RadosNotification*>(notify.get())
-                ->get_reservation();
-        int ret = rgw::notify::publish_reserve(
-            dpp, *store->svc()->site,
-            {rgw::notify::ObjectSyncedCreate, rgw::notify::ReplicationCreate},
-            notify_res, &obj_tags);
-        if (ret < 0) {
-          ldpp_dout(dpp, 1)
-              << "ERROR: reserving notification failed, with error: " << ret
-              << dendl;
-          // no need to return, the sync already happened
-        } else {
-          ret = rgw::notify::publish_commit(
-              &dest_obj, *bytes_transferred, ceph::real_clock::now(), etag,
-              dest_obj.get_instance(), notify_res, dpp);
-          if (ret < 0) {
-            ldpp_dout(dpp, 1)
-                << "ERROR: publishing notification failed, with error: " << ret
-                << dendl;
-          }
-        }
+        send_sync_notification(
+            dpp, store, &dest_bucket, &dest_obj, attrs, *bytes_transferred,
+            {rgw::notify::ObjectSyncedCreate, rgw::notify::ReplicationCreate});
       }
 
       if (counters) {
@@ -940,6 +942,11 @@ int RGWAsyncRemoveObj::_send_request(const DoutPrefixProvider *dpp)
   ret = del_op->delete_obj(dpp, null_yield, true);
   if (ret < 0) {
     ldpp_dout(dpp, 20) << __func__ << "(): delete_obj() obj=" << obj << " returned ret=" << ret << dendl;
+  } else {
+    send_sync_notification(
+        dpp, store, bucket.get(), obj.get(), obj->get_attrs(),
+        obj->get_obj_size(),
+        {rgw::notify::ObjectSyncedDelete, rgw::notify::ReplicationDelete});
   }
   return ret;
 }