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

Merge branch 'mds_issue_caps'

Browse Source
This commit is contained in:
Sage Weil 2011-06-13 09:43:49 -07:00
commit 0f8fbd562c
4 changed files with 197 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
src/mds/Locker.cc
View File

@ -327,6 +327,10 @@ bool Locker::acquire_locks(MDRequest *mdr,
return false;
}
// caps i'll need to issue
set<CInode*> issue_set;
bool result = false;
// acquire locks.
// make sure they match currently acquired locks.
set<SimpleLock*, SimpleLock::ptr_lt>::iterator existing = mdr->locks.begin();
@ -339,16 +343,14 @@ bool Locker::acquire_locks(MDRequest *mdr,
// right kind?
SimpleLock *have = *existing;
existing++;
if (xlocks.count(*p) && mdr->xlocks.count(*p)) {
if (xlocks.count(*p) && mdr->xlocks.count(*p))
dout(10) << " already xlocked " << *have << " " << *have->get_parent() << dendl;
}
else if (wrlocks.count(*p) && mdr->wrlocks.count(*p)) {
else if (wrlocks.count(*p) && mdr->wrlocks.count(*p))
dout(10) << " already wrlocked " << *have << " " << *have->get_parent() << dendl;
}
else if (rdlocks.count(*p) && mdr->rdlocks.count(*p)) {
else if (rdlocks.count(*p) && mdr->rdlocks.count(*p))
dout(10) << " already rdlocked " << *have << " " << *have->get_parent() << dendl;
}
else assert(0);
else
assert(0);
continue;
}
@ -357,26 +359,29 @@ bool Locker::acquire_locks(MDRequest *mdr,
SimpleLock *stray = *existing;
existing++;
dout(10) << " unlocking out-of-order " << *stray << " " << *stray->get_parent() << dendl;
bool need_issue = false;
if (mdr->xlocks.count(stray))
xlock_finish(stray, mdr);
xlock_finish(stray, mdr, &need_issue);
else if (mdr->wrlocks.count(stray))
wrlock_finish(stray, mdr);
wrlock_finish(stray, mdr, &need_issue);
else
rdlock_finish(stray, mdr);
rdlock_finish(stray, mdr, &need_issue);
if (need_issue)
issue_set.insert((CInode*)stray->get_parent());
}
// lock
if (xlocks.count(*p)) {
if (!xlock_start(*p, mdr))
return false;
goto out;
dout(10) << " got xlock on " << **p << " " << *(*p)->get_parent() << dendl;
} else if (wrlocks.count(*p)) {
if (!wrlock_start(*p, mdr))
return false;
goto out;
dout(10) << " got wrlock on " << **p << " " << *(*p)->get_parent() << dendl;
} else {
if (!rdlock_start(*p, mdr))
return false;
goto out;
dout(10) << " got rdlock on " << **p << " " << *(*p)->get_parent() << dendl;
}
}
@ -386,16 +391,23 @@ bool Locker::acquire_locks(MDRequest *mdr,
SimpleLock *stray = *existing;
existing++;
dout(10) << " unlocking extra " << *stray << " " << *stray->get_parent() << dendl;
bool need_issue = false;
if (mdr->xlocks.count(stray))
xlock_finish(stray, mdr);
xlock_finish(stray, mdr, &need_issue);
else if (mdr->wrlocks.count(stray))
wrlock_finish(stray, mdr);
wrlock_finish(stray, mdr, &need_issue);
else
rdlock_finish(stray, mdr);
rdlock_finish(stray, mdr, &need_issue);
if (need_issue)
issue_set.insert((CInode*)stray->get_parent());
}
mdr->done_locking = true;
return true;
result = true;
out:
issue_caps_set(issue_set);
return result;
}
@ -409,30 +421,81 @@ void Locker::set_xlocks_done(Mutation *mut)
}
}
void Locker::drop_locks(Mutation *mut)
void Locker::drop_locks(Mutation *mut, set<CInode*> *pneed_issue)
{
// leftover locks
while (!mut->xlocks.empty())
xlock_finish(*mut->xlocks.begin(), mut);
while (!mut->rdlocks.empty())
rdlock_finish(*mut->rdlocks.begin(), mut);
while (!mut->wrlocks.empty())
wrlock_finish(*mut->wrlocks.begin(), mut);
set<CInode*> my_need_issue;
if (!pneed_issue)
pneed_issue = &my_need_issue;
while (!mut->xlocks.empty()) {
bool ni = false;
MDSCacheObject *p = (*mut->xlocks.begin())->get_parent();
xlock_finish(*mut->xlocks.begin(), mut, &ni);
if (ni)
pneed_issue->insert((CInode*)p);
}
while (!mut->rdlocks.empty()) {
bool ni = false;
MDSCacheObject *p = (*mut->rdlocks.begin())->get_parent();
rdlock_finish(*mut->rdlocks.begin(), mut, &ni);
if (ni)
pneed_issue->insert((CInode*)p);
}
while (!mut->wrlocks.empty()) {
bool ni = false;
MDSCacheObject *p = (*mut->wrlocks.begin())->get_parent();
wrlock_finish(*mut->wrlocks.begin(), mut, &ni);
if (ni)
pneed_issue->insert((CInode*)p);
}
if (pneed_issue == &my_need_issue)
issue_caps_set(*pneed_issue);
mut->done_locking = false;
}
void Locker::drop_non_rdlocks(Mutation *mut)
void Locker::drop_non_rdlocks(Mutation *mut, set<CInode*> *pneed_issue)
{
while (!mut->xlocks.empty())
xlock_finish(*mut->xlocks.begin(), mut);
while (!mut->wrlocks.empty())
wrlock_finish(*mut->wrlocks.begin(), mut);
set<CInode*> my_need_issue;
if (!pneed_issue)
pneed_issue = &my_need_issue;
while (!mut->xlocks.empty()) {
bool ni = false;
MDSCacheObject *p = (*mut->xlocks.begin())->get_parent();
xlock_finish(*mut->xlocks.begin(), mut, &ni);
if (ni)
pneed_issue->insert((CInode*)p);
}
while (!mut->wrlocks.empty()) {
bool ni = false;
MDSCacheObject *p = (*mut->wrlocks.begin())->get_parent();
wrlock_finish(*mut->wrlocks.begin(), mut, &ni);
if (ni)
pneed_issue->insert((CInode*)p);
}
if (pneed_issue == &my_need_issue)
issue_caps_set(*pneed_issue);
}
void Locker::drop_rdlocks(Mutation *mut)
void Locker::drop_rdlocks(Mutation *mut, set<CInode*> *pneed_issue)
{
while (!mut->rdlocks.empty())
rdlock_finish(*mut->rdlocks.begin(), mut);
set<CInode*> my_need_issue;
if (!pneed_issue)
pneed_issue = &my_need_issue;
while (!mut->rdlocks.empty()) {
bool ni = false;
MDSCacheObject *p = (*mut->rdlocks.begin())->get_parent();
rdlock_finish(*mut->rdlocks.begin(), mut, &ni);
if (ni)
pneed_issue->insert((CInode*)p);
}
if (pneed_issue == &my_need_issue)
issue_caps_set(*pneed_issue);
}
@ -714,7 +777,7 @@ void Locker::try_eval(CInode *in, int mask)
eval(in, mask);
}
void Locker::eval_cap_gather(CInode *in)
void Locker::eval_cap_gather(CInode *in, set<CInode*> *issue_set)
{
bool need_issue = false;
list<Context*> finishers;
@ -729,8 +792,12 @@ void Locker::eval_cap_gather(CInode *in)
if (!in->xattrlock.is_stable())
eval_gather(&in->xattrlock, false, &need_issue, &finishers);
if (need_issue && in->is_head())
issue_caps(in);
if (need_issue && in->is_head()) {
if (issue_set)
issue_set->insert(in);
else
issue_caps(in);
}
finish_contexts(finishers);
}
@ -889,7 +956,7 @@ void Locker::nudge_log(SimpleLock *lock)
mds->mdlog->flush();
}
void Locker::rdlock_finish(SimpleLock *lock, Mutation *mut)
void Locker::rdlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue)
{
// drop ref
lock->put_rdlock();
@ -903,9 +970,9 @@ void Locker::rdlock_finish(SimpleLock *lock, Mutation *mut)
// last one?
if (!lock->is_rdlocked()) {
if (!lock->is_stable())
eval_gather(lock);
eval_gather(lock, false, pneed_issue);
else if (lock->get_parent()->is_auth())
eval(lock);
eval(lock, pneed_issue);
}
}
@ -942,8 +1009,12 @@ void Locker::rdlock_take_set(set<SimpleLock*>& locks)
void Locker::rdlock_finish_set(set<SimpleLock*>& locks)
{
dout(10) << "rdlock_finish_set " << locks << dendl;
for (set<SimpleLock*>::iterator p = locks.begin(); p != locks.end(); ++p)
rdlock_finish(*p, 0);
for (set<SimpleLock*>::iterator p = locks.begin(); p != locks.end(); ++p) {
bool need_issue = false;
rdlock_finish(*p, 0, &need_issue);
if (need_issue)
issue_caps((CInode*)(*p)->get_parent());
}
}
@ -1024,7 +1095,7 @@ bool Locker::wrlock_start(SimpleLock *lock, MDRequest *mut, bool nowait)
return false;
}
void Locker::wrlock_finish(SimpleLock *lock, Mutation *mut)
void Locker::wrlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue)
{
if (lock->get_type() == CEPH_LOCK_IVERSION ||
lock->get_type() == CEPH_LOCK_DVERSION)
@ -1039,9 +1110,9 @@ void Locker::wrlock_finish(SimpleLock *lock, Mutation *mut)
if (!lock->is_wrlocked()) {
if (!lock->is_stable())
eval_gather(lock);
eval_gather(lock, false, pneed_issue);
else if (lock->get_parent()->is_auth())
eval(lock);
eval(lock, pneed_issue);
}
}
@ -1110,7 +1181,7 @@ bool Locker::xlock_start(SimpleLock *lock, MDRequest *mut)
}
}
void Locker::xlock_finish(SimpleLock *lock, Mutation *mut)
void Locker::xlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue)
{
if (lock->get_type() == CEPH_LOCK_IVERSION ||
lock->get_type() == CEPH_LOCK_DVERSION)
@ -1154,7 +1225,8 @@ void Locker::xlock_finish(SimpleLock *lock, Mutation *mut)
lock->set_state(LOCK_EXCL);
else
lock->set_state(LOCK_LOCK);
do_issue = true;
if (lock->get_cap_shift())
do_issue = true;
}
// others waiting?
@ -1165,11 +1237,14 @@ void Locker::xlock_finish(SimpleLock *lock, Mutation *mut)
// eval?
if (!lock->is_stable())
eval_gather(lock);
else {
if (lock->get_parent()->is_auth())
eval(lock);
if (do_issue && lock->get_type() != CEPH_LOCK_DN)
eval_gather(lock, false, &do_issue);
else if (lock->get_parent()->is_auth())
eval(lock, &do_issue);
if (do_issue) {
if (pneed_issue)
*pneed_issue = true;
else
issue_caps((CInode*)lock->get_parent());
}
}
@ -1239,7 +1314,8 @@ void Locker::file_update_finish(CInode *in, Mutation *mut, bool share, client_t
if (ack)
mds->send_message_client_counted(ack, client);
drop_locks(mut);
set<CInode*> need_issue;
drop_locks(mut, &need_issue);
mut->cleanup();
delete mut;
@ -1263,15 +1339,17 @@ void Locker::file_update_finish(CInode *in, Mutation *mut, bool share, client_t
p++;
}
if (gather)
eval_cap_gather(in);
eval_cap_gather(in, &need_issue);
} else {
if (cap && (cap->wanted() & ~cap->pending())) {
if (cap && (cap->wanted() & ~cap->pending()) &&
need_issue.count(in) == 0) { // if we won't issue below anyway
issue_caps(in, cap);
}
if (share && in->is_auth() && in->filelock.is_stable())
share_inode_max_size(in);
}
issue_caps_set(need_issue);
// unlinked stray? may need to purge (e.g., after all caps are released)
mdcache->maybe_eval_stray(in);
@ -1342,6 +1420,11 @@ Capability* Locker::issue_new_caps(CInode *in,
}
void Locker::issue_caps_set(set<CInode*>& inset)
{
for (set<CInode*>::iterator p = inset.begin(); p != inset.end(); ++p)
issue_caps(*p);
}
bool Locker::issue_caps(CInode *in, Capability *only_cap)
{
@ -3088,6 +3171,12 @@ bool Locker::simple_sync(SimpleLock *lock, bool *need_issue)
}
lock->set_state(LOCK_SYNC);
lock->finish_waiters(SimpleLock::WAIT_RD|SimpleLock::WAIT_STABLE);
if (in) {
if (need_issue)
*need_issue = true;
else
issue_caps(in);
}
return true;
}
@ -3136,6 +3225,12 @@ void Locker::simple_excl(SimpleLock *lock, bool *need_issue)
} else {
lock->set_state(LOCK_EXCL);
lock->finish_waiters(SimpleLock::WAIT_WR|SimpleLock::WAIT_STABLE);
if (in) {
if (need_issue)
*need_issue = true;
else
issue_caps(in);
}
}
}
@ -3571,7 +3666,8 @@ void Locker::scatter_tempsync(ScatterLock *lock, bool *need_issue)
if (lock->is_xlocked())
gather++;
if (in->issued_caps_need_gather(lock)) {
if (lock->get_cap_shift() &&
in->issued_caps_need_gather(lock)) {
if (need_issue)
*need_issue = true;
else
@ -3592,6 +3688,12 @@ void Locker::scatter_tempsync(ScatterLock *lock, bool *need_issue)
// do tempsync
lock->set_state(LOCK_TSYN);
lock->finish_waiters(ScatterLock::WAIT_RD|ScatterLock::WAIT_STABLE);
if (lock->get_cap_shift()) {
if (need_issue)
*need_issue = true;
else
issue_caps(in);
}
}
}
@ -3782,10 +3884,12 @@ void Locker::scatter_mix(ScatterLock *lock, bool *need_issue)
// change lock
lock->set_state(LOCK_MIX);
lock->clear_scatter_wanted();
if (need_issue)
*need_issue = true;
else
issue_caps(in);
if (lock->get_cap_shift()) {
if (need_issue)
*need_issue = true;
else
issue_caps(in);
}
} else {
// gather?
switch (lock->get_state()) {
@ -3807,14 +3911,13 @@ void Locker::scatter_mix(ScatterLock *lock, bool *need_issue)
revoke_client_leases(lock);
gather++;
}
if (lock->get_cap_shift()) {
if (in->issued_caps_need_gather(lock)) {
if (need_issue)
*need_issue = true;
else
issue_caps(in);
gather++;
}
if (lock->get_cap_shift() &&
in->issued_caps_need_gather(lock)) {
if (need_issue)
*need_issue = true;
else
issue_caps(in);
gather++;
}
if (in->state_test(CInode::STATE_NEEDSRECOVER)) {
mds->mdcache->queue_file_recover(in);

17
src/mds/Locker.h
View File

@ -87,13 +87,13 @@ public:
set<SimpleLock*> &wrlocks,
set<SimpleLock*> &xlocks);
void drop_locks(Mutation *mut);
void drop_locks(Mutation *mut, set<CInode*> *pneed_issue=0);
void set_xlocks_done(Mutation *mut);
void drop_non_rdlocks(Mutation *mut);
void drop_rdlocks(Mutation *mut);
void drop_non_rdlocks(Mutation *mut, set<CInode*> *pneed_issue=0);
void drop_rdlocks(Mutation *mut, set<CInode*> *pneed_issue=0);
void eval_gather(SimpleLock *lock, bool first=false, bool *need_issue=0, list<Context*> *pfinishers=0);
void eval(SimpleLock *lock, bool *need_issue=0);
void eval(SimpleLock *lock, bool *need_issue);
void eval_any(SimpleLock *lock, bool *need_issue) {
if (!lock->is_stable())
eval_gather(lock, false, need_issue);
@ -115,7 +115,7 @@ public:
};
void eval_scatter_gathers(CInode *in);
void eval_cap_gather(CInode *in);
void eval_cap_gather(CInode *in, set<CInode*> *issue_set=0);
bool eval(CInode *in, int mask);
void try_eval(CInode *in, int mask);
@ -123,7 +123,7 @@ public:
bool _rdlock_kick(SimpleLock *lock);
bool rdlock_try(SimpleLock *lock, client_t client, Context *c);
bool rdlock_start(SimpleLock *lock, MDRequest *mut, bool as_anon=false);
void rdlock_finish(SimpleLock *lock, Mutation *mut);
void rdlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue);
bool can_rdlock_set(set<SimpleLock*>& locks);
bool rdlock_try_set(set<SimpleLock*>& locks);
void rdlock_take_set(set<SimpleLock*>& locks);
@ -131,10 +131,10 @@ public:
void wrlock_force(SimpleLock *lock, Mutation *mut);
bool wrlock_start(SimpleLock *lock, MDRequest *mut, bool nowait=false);
void wrlock_finish(SimpleLock *lock, Mutation *mut);
void wrlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue);
bool xlock_start(SimpleLock *lock, MDRequest *mut);
void xlock_finish(SimpleLock *lock, Mutation *mut); // public for Server's slave UNXLOCK
void xlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue);
void xlock_export(SimpleLock *lock, Mutation *mut);
void xlock_import(SimpleLock *lock, Mutation *mut);
@ -248,6 +248,7 @@ public:
version_t issue_file_data_version(CInode *in);
Capability* issue_new_caps(CInode *in, int mode, Session *session, SnapRealm *conrealm, bool is_replay);
bool issue_caps(CInode *in, Capability *only_cap=0);
void issue_caps_set(set<CInode*>& inset);
void issue_truncate(CInode *in);
void revoke_stale_caps(Session *session);
void resume_stale_caps(Session *session);

21
src/mds/MDCache.cc
View File

@ -5006,11 +5006,14 @@ void MDCache::do_file_recover()
} else {
dout(10) << "do_file_recover skipping " << in->inode.size
<< " " << *in << dendl;
in->state_clear(CInode::STATE_NEEDSRECOVER);
in->state_clear(CInode::STATE_RECOVERING);
in->auth_unpin(this);
if (in->filelock.is_stable())
mds->locker->eval(&in->filelock);
else
if (in->filelock.is_stable()) {
bool need_issue = false;
mds->locker->eval(&in->filelock, &need_issue);
if (need_issue)
mds->locker->issue_caps(in);
} else
mds->locker->eval_gather(&in->filelock);
}
}
@ -9691,9 +9694,10 @@ void MDCache::fragment_logged_and_stored(Mutation *mut, list<CDir*>& resultfrags
delete mut;
// drop dft wrlock
mds->locker->wrlock_finish(&diri->dirfragtreelock, NULL);
mds->locker->wrlock_finish(&diri->nestlock, NULL);
mds->locker->wrlock_finish(&diri->filelock, NULL);
bool need_issue = false;
mds->locker->wrlock_finish(&diri->dirfragtreelock, NULL, &need_issue);
mds->locker->wrlock_finish(&diri->nestlock, NULL, &need_issue);
mds->locker->wrlock_finish(&diri->filelock, NULL, &need_issue);
// unfreeze resulting frags
for (list<CDir*>::iterator p = resultfrags.begin();
@ -9716,6 +9720,9 @@ void MDCache::fragment_logged_and_stored(Mutation *mut, list<CDir*>& resultfrags
dir->unfreeze_dir();
}
if (need_issue)
mds->locker->issue_caps(diri);
}

7
src/mds/Server.cc
View File

@ -1375,8 +1375,11 @@ void Server::dispatch_slave_request(MDRequest *mdr)
SimpleLock *lock = mds->locker->get_lock(mdr->slave_request->get_lock_type(),
mdr->slave_request->get_object_info());
assert(lock);
mds->locker->xlock_finish(lock, mdr);
bool need_issue = false;
mds->locker->xlock_finish(lock, mdr, &need_issue);
if (need_issue)
mds->locker->issue_caps((CInode*)lock->get_parent());
// done. no ack necessary.
mdr->slave_request->put();
mdr->slave_request = 0;