Skip to content

Commit e66db76

Browse files
committed
librbd/ImageWatcher: kick-start ExclusiveLock state machine
... that is stalled on waiting for lock and let it detect client blocklisting. This would propagate the blocklist error to the caller requesting an operation needing an exclusive lock. When a caller requests a librbd operation that requires an exclusive lock, the librbd client checks whether the exclusive lock is held by another client. If the lock is held by another client, librbd stalls its ExclusiveLock state machine and through its ImageWatcher notifies the lock owner that it wants the exclusive lock. After receiving the response from the lock owner, the ImageWatcher schedules another lock request. Meanwhile if the client gets blocklisted, the ImageWatcher fails to schedule another lock request and returns. The ExclusiveLock state machine remains stalled and the blocklist error is not propagated to the caller. Instead, when scheduling another lock request, make the ImageWatcher call the ExclusiveLock state machine's peer notification handler if the client is blocklisted. This allows the Exclusive lock state machine to detect that the client has been blocklisted in its send_acquire_lock() member function and propagate the blocklist error to the caller. Fixes: https://tracker.ceph.com/issues/61607 Signed-off-by: Ramana Raja <[email protected]>
1 parent 0b61c86 commit e66db76

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/librbd/ImageWatcher.cc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,7 @@ void ImageWatcher<I>::schedule_request_lock(bool use_timer, int timer_delay) {
576576
return;
577577
}
578578

579-
std::shared_lock watch_locker{this->m_watch_lock};
580-
if (this->is_registered(this->m_watch_lock)) {
579+
if (is_registered()) {
581580
ldout(m_image_ctx.cct, 15) << this << " requesting exclusive lock" << dendl;
582581

583582
auto ctx = new LambdaContext([this](int r) {
@@ -595,6 +594,10 @@ void ImageWatcher<I>::schedule_request_lock(bool use_timer, int timer_delay) {
595594
} else {
596595
m_task_finisher->queue(TASK_CODE_REQUEST_LOCK, ctx);
597596
}
597+
} else if (is_blocklisted()) {
598+
lderr(m_image_ctx.cct) << this << " blocklisted waiting for exclusive lock"
599+
<< dendl;
600+
m_image_ctx.exclusive_lock->handle_peer_notification(0);
598601
}
599602
}
600603

0 commit comments

Comments
 (0)