From: Yuval Lifshitz <ylifshit@redhat.com>
Date: Mon, 11 Sep 2023 14:22:51 +0000 (+0300)
Subject: Merge pull request #53081 from kchheda3/wip-add-log
X-Git-Tag: v19.0.0~510
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=150c490e2d84746a48cd332aaa2e242fb88b2851;p=ceph.git

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

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

reviewed-by: thotz, yuvalif
---

150c490e2d84746a48cd332aaa2e242fb88b2851
diff --cc src/rgw/driver/rados/rgw_notify.cc
index 205db107fa1,92a41e7ebf5..44d11a58a71
--- a/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