Merge pull request ceph#63750 from yuvalif/wip-yuval-71563

rgw/logging: log only object ACls in journal mode

Reviewed-by: Casey Bodley <[email protected]>

Author: cbodley

src/rgw/rgw_op.cc

@@ -6370,17 +6370,20 @@ void RGWPutACLs::execute(optional_yield y)
     return;
   }
 
-  const auto etag = s->object->get_attrs()[RGW_ATTR_ETAG].to_str();
-  op_ret = rgw::bucketlogging::log_record(driver,
-      rgw::bucketlogging::LoggingType::Journal,
-      s->object.get(),
-      s,
-      canonical_name(),
-      etag,
-      s->object->get_size(),
-      this, y, false, false);
-  if (op_ret < 0) {
-    return;
+  if (!rgw::sal::Object::empty(s->object)) {
+    // in journal mode we log only object ACLs
+    const auto etag = s->object->get_attrs()[RGW_ATTR_ETAG].to_str();
+    op_ret = rgw::bucketlogging::log_record(driver,
+        rgw::bucketlogging::LoggingType::Journal,
+        s->object.get(),
+        s,
+        canonical_name(),
+        etag,
+        s->object->get_size(),
+        this, y, false, false);
+    if (op_ret < 0) {
+      return;
+    }
   }
 
   bufferlist bl;