]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #51045 into pacific
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 6 Sep 2023 00:45:57 +0000 (20:45 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 6 Sep 2023 00:45:57 +0000 (20:45 -0400)
* 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>
1  2 
qa/tasks/cephfs/test_volumes.py
src/mgr/ActivePyModules.cc
src/mgr/DaemonServer.cc
src/mgr/PyModuleRegistry.h

Simple merge
Simple merge
Simple merge
index 9a286c3e404f3beb5391304576c888c287aa7396,9bc923f8d6cdeba375d0d9d2110fa8eaad561902..7e7797697d8c8f7b6e891c10ac6266a4d498ea9b
@@@ -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)
  };