From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 6 Sep 2023 00:45:57 +0000 (-0400)
Subject: Merge PR #51045 into pacific
X-Git-Tag: v16.2.15~194
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abd50cb272618f7bbad6c553d59a3f163c135a6e;p=ceph.git

Merge PR #51045 into pacific

* refs/pull/51045/head:
	qa: Add test for per-module finisher thread
	qa: allow check_counter to look at nested keys
	qa: allow specifying min for check-counter
	mgr: Add one finisher thread per module

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
---

abd50cb272618f7bbad6c553d59a3f163c135a6e
diff --cc src/mgr/PyModuleRegistry.h
index 9a286c3e404f,9bc923f8d6cd..7e7797697d8c
--- a/src/mgr/PyModuleRegistry.h
+++ b/src/mgr/PyModuleRegistry.h
@@@ -221,9 -219,23 +221,19 @@@ public
  
    auto get_clients() const
    {
 -    std::scoped_lock l(lock);
 -    std::vector<entity_addrvec_t> v;
 -    for (const auto& p : clients) {
 -      v.push_back(p.second);
 -    }
 -    return v;
 +    std::lock_guard l(lock);
 +    return clients;
    }
  
+   bool is_module_active(const std::string &name) {
+     ceph_assert(active_modules);
+     return active_modules->module_exists(name);
+   }
+ 
+   auto& get_active_module_finisher(const std::string &name) {
+     ceph_assert(active_modules);
+     return active_modules->get_module_finisher(name);
+   }
+ 
    // <<< (end of ActivePyModules cheeky call-throughs)
  };