From: Patrick Donnelly <pdonnell@ibm.com>
Date: Wed, 30 Apr 2025 12:36:28 +0000 (-0400)
Subject: Merge PR #61287 into squid
X-Git-Tag: v19.2.3~162
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e36ca7b51b46bf0ddfcec53c58543a98a6739d80;p=ceph.git

Merge PR #61287 into squid

* refs/pull/61287/head:
	mds: add or update MDS thread names
	log: cache recent threads up to a day
	common: cache pthread names
	log: concatenate thread names and print once per thread

Reviewed-by: Laura Flores <lflores@redhat.com>
---

e36ca7b51b46bf0ddfcec53c58543a98a6739d80
diff --cc src/mds/MDLog.cc
index d3fa9ff3ebe,ed72a2ce82c..75515cdf1e1
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@@ -616,11 -614,9 +616,13 @@@ void MDLog::try_to_commit_open_file_tab
    }
  }
  
 +bool MDLog::is_trim_slow() const {
 +  return (segments.size() > (size_t)(max_segments * log_warn_factor));
 +}
 +
  void MDLog::log_trim_upkeep(void) {
+   ceph_pthread_setname("mds-log-trim");
+ 
    dout(10) << dendl;
  
    std::unique_lock mds_lock(mds->mds_lock);
diff --cc src/rgw/driver/rados/rgw_notify.cc
index e3f7710b401,3097933b543..48bd7522632
--- a/src/rgw/driver/rados/rgw_notify.cc
+++ b/src/rgw/driver/rados/rgw_notify.cc
@@@ -19,28 -19,12 +19,29 @@@
  #include "rgw_perf_counters.h"
  #include "services/svc_zone.h"
  #include "common/dout.h"
 +#include "rgw_url.h"
  #include <chrono>
+ #include <fmt/format.h>
  
 -#define dout_subsys ceph_subsys_rgw
 +#define dout_subsys ceph_subsys_rgw_notification
  
  namespace rgw::notify {
 +  
 +static inline std::ostream& operator<<(std::ostream& out,
 +                                       const event_entry_t& e) {
 +  std::string host;
 +  std::string user;
 +  std::string password;
 +  parse_url_authority(e.push_endpoint, host, user, password);
 +  return out << "notification id: '" << e.event.configurationId
 +             << "', topic: '" << e.arn_topic
 +             << "', endpoint: '" << host
 +             << "', endpoint_user: '" << user
 +             << "', bucket_owner: '" << e.event.bucket_ownerIdentity
 +             << "', bucket: '" << e.event.bucket_name
 +             << "', object: '" << e.event.object_key
 +             << "', event type: '" << e.event.eventName << "'";
 +}
  
  struct persistency_tracker {
    ceph::coarse_real_time last_retry_time {ceph::coarse_real_clock::zero()};