RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8641 from renhwztetecs/renhw-wip-mds-cleanup

Browse Source 
mds: MDSDaemon::init bug fix

Reviewed-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2016-06-06 10:46:59 +01:00
commit ccf5a39c89
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mds/MDSDaemon.cc
View File

@ -467,12 +467,20 @@ int MDSDaemon::init()
monc->set_messenger(messenger);
monc->set_want_keys(CEPH_ENTITY_TYPE_MON | CEPH_ENTITY_TYPE_OSD | CEPH_ENTITY_TYPE_MDS);
monc->init();
int r = 0;
r = monc->init();
if (r < 0) {
derr << "ERROR: failed to get monmap: " << cpp_strerror(-r) << dendl;
mds_lock.Lock();
suicide();
mds_lock.Unlock();
return r;
}
// tell monc about log_client so it will know about mon session resets
monc->set_log_client(&log_client);
int r = monc->authenticate();
r = monc->authenticate();
if (r < 0) {
derr << "ERROR: failed to authenticate: " << cpp_strerror(-r) << dendl;
mds_lock.Lock();
@ -551,7 +559,6 @@ int MDSDaemon::init()
// schedule tick
reset_tick();
g_conf->add_observer(this);
mds_lock.Unlock();
return 0;