RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #21601 into master

Browse Source 
* refs/pull/21601/head:
	mds: don't discover inode/dirfrag when mds is in 'starting' state

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-04-29 11:05:16 -07:00
commit 0c11a6fcb4
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
3 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mds/MDCache.cc
View File

@ -613,6 +613,24 @@ void MDCache::open_mydir_inode(MDSInternalContextBase *c)
in->fetch(c);
}
void MDCache::open_mydir_frag(MDSInternalContextBase *c)
{
open_mydir_inode(
new MDSInternalContextWrapper(mds,
new FunctionContext([this, c](int r) {
if (r < 0) {
c->complete(r);
return;
}
CDir *mydir = myin->get_or_open_dirfrag(this, frag_t());
assert(mydir);
adjust_subtree_auth(mydir, mds->get_nodeid());
mydir->fetch(c);
})
)
);
}
void MDCache::open_root()
{
dout(10) << "open_root" << dendl;

1
src/mds/MDCache.h
View File

@ -915,6 +915,7 @@ public:
void open_root_inode(MDSInternalContextBase *c);
void open_root();
void open_mydir_inode(MDSInternalContextBase *c);
void open_mydir_frag(MDSInternalContextBase *c);
void populate_mydir();
void _create_system_file(CDir *dir, const char *name, CInode *in, MDSInternalContextBase *fin);

36
src/mds/MDSRank.cc
View File

@ -1090,17 +1090,21 @@ void MDSRank::boot_start(BootStep step, int r)
MDSGatherBuilder gather(g_ceph_context,
new C_MDS_BootStart(this, MDS_BOOT_PREPARE_LOG));
mdcache->open_mydir_inode(gather.new_sub());
if (is_starting()) {
// load mydir frag for the first log segment (creating subtree map)
mdcache->open_mydir_frag(gather.new_sub());
} else {
mdcache->open_mydir_inode(gather.new_sub());
}
mdcache->create_global_snaprealm();
if (is_starting() ||
whoami == mdsmap->get_root()) { // load root inode off disk if we are auth
mdcache->open_root_inode(gather.new_sub());
} else {
// replay. make up fake root inode to start with
(void)mdcache->create_root_inode();
}
if (whoami == mdsmap->get_root()) { // load root inode off disk if we are auth
mdcache->open_root_inode(gather.new_sub());
} else if (is_any_replay()) {
// replay. make up fake root inode to start with
mdcache->create_root_inode();
}
gather.activate();
}
break;
@ -1166,16 +1170,7 @@ void MDSRank::starting_done()
assert(is_starting());
request_state(MDSMap::STATE_ACTIVE);
mdcache->open_root();
if (mdcache->is_open()) {
mdlog->start_new_segment();
} else {
mdcache->wait_for_open(new MDSInternalContextWrapper(this,
new FunctionContext([this] (int r) {
mdlog->start_new_segment();
})));
}
mdlog->start_new_segment();
// sync snaptable cache
snapclient->sync(new C_MDSInternalNoop);
@ -1476,7 +1471,8 @@ void MDSRank::active_start()
{
dout(1) << "active_start" << dendl;
if (last_state == MDSMap::STATE_CREATING) {
if (last_state == MDSMap::STATE_CREATING ||
last_state == MDSMap::STATE_STARTING) {
mdcache->open_root();
}
@ -1744,7 +1740,7 @@ void MDSRankDispatcher::handle_mds_map(
// REJOIN
// is everybody finally rejoining?
if (is_starting() || is_rejoin() || is_clientreplay() || is_active() || is_stopping()) {
if (is_rejoin() || is_clientreplay() || is_active() || is_stopping()) {
// did we start?
if (!oldmap->is_rejoining() && mdsmap->is_rejoining())
rejoin_joint_start();