Merge pull request #53081 from kchheda3/wip-add-log

rgw/notification: enrich the expired notification log line for persistent notificatio

reviewed-by: thotz, yuvalif

diff --cc src/rgw/driver/rados/rgw_notify.cc
index 205db107fa19633d154e1d9aea9ce33dcb14b0b8,92a41e7ebf5fd7b67fafc1b2e5510ca329ecfffb..44d11a58a712728cba32550734b0998d700029c3
--- 1/src/rgw/driver/rados/rgw_notify.cc
--- 2/src/rgw/driver/rados/rgw_notify.cc
+++ b/src/rgw/driver/rados/rgw_notify.cc
@@@ -216,11 -201,19 +216,18 @@@ private
      if ( (topic_persistency_ttl != 0 && event_entry.creation_time != ceph::coarse_real_clock::zero() &&
           time_now - event_entry.creation_time > std::chrono::seconds(topic_persistency_ttl))
           || ( topic_persistency_max_retries != 0 && entry_persistency_tracker.retires_num >  topic_persistency_max_retries) ) {
-       ldpp_dout(this, 20) << "Expiring entry retry_number=" << entry_persistency_tracker.retires_num << " creation_time="
-                           << event_entry.creation_time << " time_now:" << time_now << dendl;
+       ldpp_dout(this, 1) << "Expiring entry for topic= "
+                          << event_entry.arn_topic << " bucket_owner= "
+                          << event_entry.event.bucket_ownerIdentity
+                          << " bucket= " << event_entry.event.bucket_name
+                          << " object_name= " << event_entry.event.object_key
+                          << " entry retry_number="
+                          << entry_persistency_tracker.retires_num
+                          << " creation_time=" << event_entry.creation_time
+                          << " time_now=" << time_now << dendl;
        return EntryProcessingResult::Expired;
      }
 -    if (time_now - entry_persistency_tracker.last_retry_time
 -        < std::chrono::seconds(conf->rgw_topic_persistency_sleep_duration) ) {
 +    if (time_now - entry_persistency_tracker.last_retry_time < std::chrono::seconds(topic_persistency_sleep_duration) ) {
        return EntryProcessingResult::Sleeping;
      }
      // TODO: write back the entry with creation time as if now