From 99d3a59d4bb792199a9b6c4d43b1b0bb75c57e45 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Fri, 4 Mar 2022 15:57:30 +0000 Subject: [PATCH] auth: refactor KeyServer::get_used_pending_keys(). Signed-off-by: Radoslaw Zarzynski --- src/auth/cephx/CephxKeyServer.cc | 6 ++++-- src/auth/cephx/CephxKeyServer.h | 4 ++-- src/mon/AuthMonitor.cc | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/auth/cephx/CephxKeyServer.cc b/src/auth/cephx/CephxKeyServer.cc index ece342155b1..236ac451add 100644 --- a/src/auth/cephx/CephxKeyServer.cc +++ b/src/auth/cephx/CephxKeyServer.cc @@ -249,10 +249,12 @@ void KeyServer::clear_used_pending_keys() used_pending_keys.clear(); } -void KeyServer::get_used_pending_keys(std::map *used) +std::map KeyServer::get_used_pending_keys() { + std::map ret; std::scoped_lock l(lock); - used->swap(used_pending_keys); + ret.swap(used_pending_keys); + return ret; } bool KeyServer::generate_secret(CryptoKey& secret) diff --git a/src/auth/cephx/CephxKeyServer.h b/src/auth/cephx/CephxKeyServer.h index 62b98841411..64915c8ce4a 100644 --- a/src/auth/cephx/CephxKeyServer.h +++ b/src/auth/cephx/CephxKeyServer.h @@ -215,8 +215,8 @@ public: void note_used_pending_key(const EntityName& name, const CryptoKey& key); void clear_used_pending_keys(); - void get_used_pending_keys(std::map *used); - + std::map get_used_pending_keys(); + int start_server(); void rotate_timeout(double timeout); diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 0f7ab5ed03d..16c3e8991b4 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -154,8 +154,7 @@ void AuthMonitor::tick() } if (mon.monmap->min_mon_release >= ceph_release_t::quincy) { - std::map used_pending_keys; - mon.key_server.get_used_pending_keys(&used_pending_keys); + auto used_pending_keys = mon.key_server.get_used_pending_keys(); if (!used_pending_keys.empty()) { dout(10) << __func__ << " " << used_pending_keys.size() << " used pending_keys" << dendl; -- 2.39.5