RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/Mgr: use cond (not context) for FSMap wait

Browse Source 
This is simpler.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-04-04 14:27:41 -04:00
parent d88f0fdb39
commit 1113eb123b
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mgr/ClusterState.h
View File

@ -71,6 +71,11 @@ public:
void notify_osdmap(const OSDMap &osd_map);
bool have_fsmap() {
Mutex::Locker l(lock);
return fsmap.get_epoch() > 0;
}
template<typename Callback, typename...Args>
void with_fsmap(Callback&& cb, Args&&...args)
{

18
src/mgr/Mgr.cc
View File

@ -46,7 +46,6 @@ Mgr::Mgr(MonClient *monc_, Messenger *clientm_, Objecter *objecter_,
lock("Mgr::lock"),
timer(g_ceph_context, lock),
finisher(g_ceph_context, "Mgr", "mgr-fin"),
waiting_for_fs_map(NULL),
py_modules(daemon_state, cluster_state, *monc, finisher),
cluster_state(monc, nullptr),
server(monc, daemon_state, cluster_state, py_modules, clog_, audit_clog_),
@ -59,7 +58,6 @@ Mgr::Mgr(MonClient *monc_, Messenger *clientm_, Objecter *objecter_,
Mgr::~Mgr()
{
assert(waiting_for_fs_map == nullptr);
}
@ -186,19 +184,14 @@ void Mgr::init()
monc->sub_want("mgrdigest", 0, 0);
// Prepare to receive FSMap and request it
dout(4) << "requesting FSMap..." << dendl;
C_SaferCond cond;
waiting_for_fs_map = &cond;
monc->sub_want("fsmap", 0, 0);
monc->renew_subs();
// Wait for FSMap
dout(4) << "waiting for FSMap..." << dendl;
lock.Unlock();
cond.wait();
lock.Lock();
waiting_for_fs_map = nullptr;
dout(4) << "Got FSMap." << dendl;
while (!cluster_state.have_fsmap()) {
fs_map_cond.Wait(lock);
}
// Wait for MgrDigest...?
@ -486,10 +479,7 @@ void Mgr::handle_fs_map(MFSMap* m)
const FSMap &new_fsmap = m->get_fsmap();
if (waiting_for_fs_map) {
waiting_for_fs_map->complete(0);
waiting_for_fs_map = NULL;
}
fs_map_cond.Signal();
// TODO: callers (e.g. from python land) are potentially going to see
// the new fsmap before we've bothered populating all the resulting

2
src/mgr/Mgr.h
View File

@ -54,7 +54,7 @@ protected:
SafeTimer timer;
Finisher finisher;
Context *waiting_for_fs_map;
Cond fs_map_cond;
PyModules py_modules;
DaemonStateIndex daemon_state;