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

mds: introduce rejoin_invent_dirfrag() helper

Browse Source 
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2010-12-06 14:34:36 -08:00
parent 1e2e4aa0f4
commit 4f6439945b
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/mds/MDCache.cc
View File

@ -3596,6 +3596,22 @@ CInode *MDCache::rejoin_invent_inode(inodeno_t ino, snapid_t last)
return in;
}
CDir *MDCache::rejoin_invent_dirfrag(dirfrag_t df)
{
CInode *in = get_inode(df.ino);
if (!in) {
in = rejoin_invent_inode(df.ino, CEPH_NOSNAP);
if (!in->is_dir()) {
assert(in->state_test(CInode::STATE_REJOINUNDEF));
in->inode.mode = S_IFDIR;
}
}
assert(in->is_dir());
CDir *dir = in->get_or_open_dirfrag(this, df.frag);
dout(10) << " invented " << *dir << dendl;
return dir;
}
/* This functions DOES NOT put the passed message before returning */
void MDCache::handle_cache_rejoin_strong(MMDSCacheRejoin *strong)
{
@ -3624,19 +3640,10 @@ void MDCache::handle_cache_rejoin_strong(MMDSCacheRejoin *strong)
p != strong->strong_dirfrags.end();
++p) {
CDir *dir = get_dirfrag(p->first);
if (!dir) {
CInode *in = get_inode(p->first.ino);
if (!in)
in = rejoin_invent_inode(p->first.ino, CEPH_NOSNAP);
if (!in->is_dir()) {
assert(in->state_test(CInode::STATE_REJOINUNDEF));
in->inode.mode = S_IFDIR;
}
dir = in->get_or_open_dirfrag(this, p->first.frag);
dout(10) << " invented " << *dir << dendl;
} else {
if (!dir)
dir = rejoin_invent_dirfrag(p->first);
else
dout(10) << " have " << *dir << dendl;
}
dir->add_replica(from);
dir->dir_rep = p->second.dir_rep;

1
src/mds/MDCache.h
View File

@ -726,6 +726,7 @@ protected:
void handle_cache_rejoin(MMDSCacheRejoin *m);
void handle_cache_rejoin_weak(MMDSCacheRejoin *m);
CInode* rejoin_invent_inode(inodeno_t ino, snapid_t last);
CDir* rejoin_invent_dirfrag(dirfrag_t df);
void handle_cache_rejoin_strong(MMDSCacheRejoin *m);
void rejoin_scour_survivor_replicas(int from, MMDSCacheRejoin *ack, set<vinodeno_t>& acked_inodes);
void handle_cache_rejoin_ack(MMDSCacheRejoin *m);