diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2013-03-20 15:42:50 +0800 |
|---|---|---|
| committer | Yan, Zheng <zheng.z.yan@intel.com> | 2013-05-28 13:57:20 +0800 |
| commit | 8b4e9911a4f9bafadc6fb6eed3fde3e378599761 (patch) | |
| tree | c91b0b8873ac681ee44ec46a2c6cbd5e69e59d00 | |
| parent | 8c1c2d98c6dc0611e4eb09086fb3939088bad826 (diff) | |
| download | ceph-8b4e9911a4f9bafadc6fb6eed3fde3e378599761.tar.gz | |
mds: journal new subtrees created by rename
this avoids creating bare dirfrags during journal replay.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
| -rw-r--r-- | src/mds/Server.cc | 10 | ||||
| -rw-r--r-- | src/mds/journal.cc | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/mds/Server.cc b/src/mds/Server.cc index b526b5e036a..63401e8b195 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -6306,6 +6306,16 @@ void Server::_rename_prepare(MDRequest *mdr, dout(10) << " forced journaling destdn " << *destdn << dendl; metablob->add_dir_context(destdn->get_dir()); metablob->add_primary_dentry(destdn, true, srci); + if (srcdn->is_auth() && srci->is_dir()) { + // journal new subtrees root dirfrags + list<CDir*> ls; + srci->get_dirfrags(ls); + for (list<CDir*>::iterator p = ls.begin(); p != ls.end(); ++p) { + CDir *dir = *p; + if (dir->is_auth()) + metablob->add_dir(dir, true); + } + } } } diff --git a/src/mds/journal.cc b/src/mds/journal.cc index b8139e3a05b..11ce5acf479 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -1280,7 +1280,8 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg, MDSlaveUpdate *slaveup) list<frag_t> leaves; renamed_diri->dirfragtree.get_leaves(leaves); for (list<frag_t>::iterator p = leaves.begin(); p != leaves.end(); ++p) { - CDir *dir = renamed_diri->get_or_open_dirfrag(mds->mdcache, *p); + CDir *dir = renamed_diri->get_dirfrag(*p); + assert(dir); // preserve subtree bound until slave commit if (dir->get_dir_auth() == CDIR_AUTH_UNDEF) slaveup->olddirs.insert(dir); |