File tree Expand file tree Collapse file tree 2 files changed +3
-8
lines changed
Expand file tree Collapse file tree 2 files changed +3
-8
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,6 @@ namespace mirror {
3030template <typename I>
3131Throttler<I>::Throttler(CephContext *cct, const std::string &config_key)
3232 : m_cct(cct), m_config_key(config_key),
33- m_config_keys{m_config_key.c_str (), nullptr },
3433 m_lock (ceph::make_mutex(
3534 librbd::util::unique_lock_name (" rbd::mirror::Throttler" , this ))),
3635 m_max_concurrent_ops(cct->_conf.get_val<uint64_t >(m_config_key)) {
@@ -221,11 +220,6 @@ void Throttler<I>::print_status(ceph::Formatter *f) {
221220 f->dump_int (" waiting_requests" , m_queue.size ());
222221}
223222
224- template <typename I>
225- const char ** Throttler<I>::get_tracked_conf_keys() const {
226- return m_config_keys;
227- }
228-
229223template <typename I>
230224void Throttler<I>::handle_conf_change(const ConfigProxy& conf,
231225 const std::set<std::string> &changed) {
Original file line number Diff line number Diff line change @@ -53,15 +53,16 @@ class Throttler : public md_config_obs_t {
5353
5454 CephContext *m_cct;
5555 const std::string m_config_key;
56- mutable const char * m_config_keys[2 ];
5756
5857 ceph::mutex m_lock;
5958 uint32_t m_max_concurrent_ops;
6059 std::list<Id> m_queue;
6160 std::map<Id, Context *> m_queued_ops;
6261 std::set<Id> m_inflight_ops;
6362
64- const char **get_tracked_conf_keys () const override ;
63+ std::vector<std::string> get_tracked_keys () const noexcept override {
64+ return std::vector<std::string>{m_config_key};
65+ }
6566 void handle_conf_change (const ConfigProxy& conf,
6667 const std::set<std::string> &changed) override ;
6768};
You can’t perform that action at this time.
0 commit comments