Skip to content

Commit

Permalink
mds/quiesce: don't take mirrored locks on the replica
Browse files Browse the repository at this point in the history
For every mirrored lock, the auth will message the replica to ensure
the replicated lock state. For x/rdlock on the auth, it will be
LOCK_LOCK state on the replica, which has the file caps we want
for quiesce: CACHE and BUFFER.

It should be sufficient to only hold the quiesce local lock
on the replica side.

Signed-off-by: Leonid Usov <leonid.usov@ibm.com>
  • Loading branch information
leonid-s-usov committed Apr 15, 2024
1 parent c0f0200 commit 1be0a7e
Showing 1 changed file with 47 additions and 39 deletions.
86 changes: 47 additions & 39 deletions src/mds/MDCache.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13623,31 +13623,37 @@ void MDCache::dispatch_quiesce_inode(const MDRequestRef& mdr)

lov.add_xlock(&in->quiescelock); /* !! */

lov.add_rdlock(&in->policylock); /* for the quiesce_block xattr test */
if (splitauth) {
// xlock the file to let the Fb clients stay with buffered writes.
// While this will unnecesarily revoke rd caps, it's not as
// big of an overhead compared to having the Fb clients flush
// their buffers, which evidently can lead to the quiesce timeout
// We'll drop the lock after all clients conform to this request
// so the file will be still readable during the quiesce after
// the interested clients receive their Fr back
//
// NB: this will also wrlock the versionlock
lov.add_xlock(&in->filelock);
if (in->is_auth()) {
lov.add_rdlock(&in->policylock); /* for the quiesce_block xattr test */
if (splitauth) {
// xlock the file to let the Fb clients stay with buffered writes.
// While this will unnecesarily revoke rd caps, it's not as
// big of an overhead compared to having the Fb clients flush
// their buffers, which evidently can lead to the quiesce timeout
// We'll drop the lock after all clients conform to this request
// so the file will be still readable during the quiesce after
// the interested clients receive their Fr back
//
// NB: this will also wrlock the versionlock
lov.add_xlock(&in->filelock);
} else {
// if splitauth == false then we won't drop the lock after acquisition (see below)
// we can't afford keeping it as xlock for a long time, so we'll have to deal
// with the potential quiesce timeout on high-load systems.
// The reason we're OK with this is that splitauth is enabled by default,
// and really should not be ever disabled outside of the test setups
// TODO: consider removing the `splitauth` config option completely.
lov.add_rdlock(&in->filelock);
}
// The rest of caps-related locks - rdlock to revoke write caps
lov.add_rdlock(&in->authlock);
lov.add_rdlock(&in->linklock);
lov.add_rdlock(&in->xattrlock);
} else {
// if splitauth == false then we won't drop the lock after acquisition (see below)
// we can't afford keeping it as xlock for a long time, so we'll have to deal
// with the potential quiesce timeout on high-load systems.
// The reason we're OK with this is that splitauth is enabled by default,
// and really should not be ever disabled outside of the test setups
// TODO: consider removing the `splitauth` config option completely.
lov.add_rdlock(&in->filelock);
}
// The rest of caps-related locks - rdlock to revoke write caps
lov.add_rdlock(&in->authlock);
lov.add_rdlock(&in->linklock);
lov.add_rdlock(&in->xattrlock);
// replica will follow suite and move to LOCK_LOCK state
// as a result of the auth taking the above locks.
}

if (!mds->locker->acquire_locks(mdr, lov, nullptr, {in}, false, true)) {
return;
}
Expand All @@ -13665,21 +13671,23 @@ void MDCache::dispatch_quiesce_inode(const MDRequestRef& mdr)
return;
}

// the policylock isn't needed anymore
mds->locker->drop_lock(mdr.get(), &in->policylock);
if (splitauth) {
/* Once we have the queiscelock, we no longer need these locks. However,
* if splitauth==false, the replicas do not try quiescing so we must keep
* them locked.
*/
mds->locker->drop_lock(mdr.get(), &in->authlock);
mds->locker->drop_lock(mdr.get(), &in->filelock);
// versionlock will be taken automatically for the file xlock.
// We don't really need it, but it doesn't make sense to
// change the Locker logic just for this flow
mds->locker->drop_lock(mdr.get(), &in->versionlock);
mds->locker->drop_lock(mdr.get(), &in->linklock);
mds->locker->drop_lock(mdr.get(), &in->xattrlock);
if (in->is_auth()) {
// the policylock isn't needed anymore
mds->locker->drop_lock(mdr.get(), &in->policylock);
if (splitauth) {
/* Once we have the queiscelock, we no longer need these locks. However,
* if splitauth==false, the replicas do not try quiescing so we must keep
* them locked.
*/
mds->locker->drop_lock(mdr.get(), &in->authlock);
mds->locker->drop_lock(mdr.get(), &in->filelock);
// versionlock will be taken automatically for the file xlock.
// We don't really need it, but it doesn't make sense to
// change the Locker logic just for this flow
mds->locker->drop_lock(mdr.get(), &in->versionlock);
mds->locker->drop_lock(mdr.get(), &in->linklock);
mds->locker->drop_lock(mdr.get(), &in->xattrlock);
}
}
}

Expand Down

0 comments on commit 1be0a7e

Please sign in to comment.