RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-18 17:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds: misc hardlink fixes

Browse Source
This commit is contained in:
Sage Weil 2008-03-21 20:46:54 -07:00
parent 0012bb6bd9
commit 3d09096ade
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/boot.sh
View File

@ -36,7 +36,7 @@ do
done
# mds
$CEPH_BIN/cmds $ARGS --debug_mds 10
$CEPH_BIN/cmds $ARGS --debug_mds 20
echo "started. stop.sh to stop. see out/* (e.g. 'tail -f out/????') for debug output."

26
src/mds/Server.cc
View File

@ -506,7 +506,7 @@ void Server::reply_request(MDRequest *mdr, MClientReply *reply, CInode *tracei)
<< ") " << *req << dendl;
// note result code in session map?
if (!req->is_idempotent())
if (!req->is_idempotent() && mdr->session)
mdr->session->add_completed_request(mdr->reqid.tid);
/*
@ -2046,7 +2046,8 @@ void Server::_link_local(MDRequest *mdr, CDentry *dn, CInode *targeti)
le->metablob.add_client_req(mdr->reqid);
version_t dirpv = predirty_dn_diri(mdr, dn, &le->metablob); // dir inode's mtime
le->metablob.add_dir_context(dn->get_dir());
le->metablob.add_remote_dentry(dn, true, targeti->ino()); // new remote
le->metablob.add_remote_dentry(dn, true, targeti->ino(),
MODE_TO_DT(targeti->inode.mode)); // new remote
le->metablob.add_dir_context(targeti->get_parent_dir());
le->metablob.add_primary_dentry(targeti->parent, true, targeti, pi); // update old primary
@ -2128,7 +2129,8 @@ void Server::_link_remote(MDRequest *mdr, CDentry *dn, CInode *targeti)
le->metablob.add_client_req(mdr->reqid);
version_t dirpv = predirty_dn_diri(mdr, dn, &le->metablob); // dir inode's mtime
le->metablob.add_dir_context(dn->get_dir());
le->metablob.add_remote_dentry(dn, true, targeti->ino()); // new remote
le->metablob.add_remote_dentry(dn, true, targeti->ino(),
MODE_TO_DT(targeti->inode.mode)); // new remote
// mark committing (needed for proper recovery)
mdr->committing = true;
@ -2773,7 +2775,8 @@ void Server::handle_client_rename(MDRequest *mdr)
// src+dest _must_ share commont root for locking to prevent orphans
filepath destpath = req->get_filepath2();
filepath srcpath = req->get_filepath();
if (destpath.get_ino() != srcpath.get_ino()) {
if (destpath.get_ino() != srcpath.get_ino() &&
!MDS_INO_IS_STRAY(srcpath.get_ino())) { // <-- mds 'rename' out of stray dir is ok
// error out for now; eventually, we should find the deepest common root
derr(0) << "rename src + dst must share common root; fix client or fix me" << dendl;
assert(0);
@ -3208,7 +3211,8 @@ void Server::_rename_prepare(MDRequest *mdr,
dout(10) << "src is a remote dentry" << dendl;
if (destdn->is_auth())
mdr->more()->pvmap[destdn] = destdn->pre_dirty();
metablob->add_remote_dentry(destdn, true, srcdn->get_remote_ino());
metablob->add_remote_dentry(destdn, true, srcdn->get_remote_ino(),
srcdn->get_remote_d_type());
}
// remove src dentry
@ -3268,10 +3272,8 @@ void Server::_rename_apply(MDRequest *mdr, CDentry *srcdn, CDentry *destdn, CDen
dout(10) << "merging remote onto primary link" << dendl;
// nlink-- in place
destdn->inode->inode.nlink--;
destdn->inode->inode.ctime = mdr->now;
if (destdn->inode->is_auth())
destdn->inode->mark_dirty(mdr->more()->pvmap[destdn], mdr->ls);
destdn->inode->pop_and_dirty_projected_inode(mdr->ls);
// unlink srcdn
srcdn->dir->unlink_inode(srcdn);
@ -3287,10 +3289,8 @@ void Server::_rename_apply(MDRequest *mdr, CDentry *srcdn, CDentry *destdn, CDen
destdn->dir->link_primary_inode(destdn, oldin);
// nlink--
destdn->inode->inode.nlink--;
destdn->inode->inode.ctime = mdr->now;
if (destdn->inode->is_auth())
destdn->inode->mark_dirty(mdr->more()->pvmap[destdn], mdr->ls);
destdn->inode->pop_and_dirty_projected_inode(mdr->ls);
// mark src dirty
if (srcdn->is_auth())
@ -3311,15 +3311,11 @@ void Server::_rename_apply(MDRequest *mdr, CDentry *srcdn, CDentry *destdn, CDen
//assert(straypv == ipv);
// nlink-- in stray dir.
oldin->inode.nlink--;
oldin->inode.ctime = mdr->now;
if (oldin->is_auth())
oldin->pop_and_dirty_projected_inode(mdr->ls);
}
else if (oldin) {
// nlink-- remote. destdn was remote.
oldin->inode.nlink--;
oldin->inode.ctime = mdr->now;
if (oldin->is_auth())
oldin->pop_and_dirty_projected_inode(mdr->ls);
}

8
src/mds/events/EMetaBlob.h
View File

@ -306,9 +306,11 @@ private:
dirty));
}
void add_remote_dentry(CDentry *dn, bool dirty, inodeno_t rino=0) {
add_remote_dentry(add_dir(dn->get_dir(), false),
dn, dirty, rino);
void add_remote_dentry(CDentry *dn, bool dirty) {
add_remote_dentry(add_dir(dn->get_dir(), false), dn, dirty, 0, 0);
}
void add_remote_dentry(CDentry *dn, bool dirty, inodeno_t rino, int rdt) {
add_remote_dentry(add_dir(dn->get_dir(), false), dn, dirty, rino, rdt);
}
void add_remote_dentry(dirlump& lump, CDentry *dn, bool dirty,
inodeno_t rino=0, unsigned char rdt=0) {