]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
client: wake up the front pos waiter 40109/head
authorXiubo Li <xiubli@redhat.com>
Fri, 19 Feb 2021 14:05:23 +0000 (22:05 +0800)
committerXiubo Li <xiubli@redhat.com>
Mon, 15 Mar 2021 05:42:15 +0000 (13:42 +0800)
The old code was buggy, why it ran well without any problem is that
the big client_lock will make sure that the read/write won't run in
parallel, so it won't be any problem here.

But when introducing inode lock to break the client_lock, which will
allow the read/write to run parallelly, the pos waiters won't get any
chance to be woke up.

In unlock_fh_pos(), it will always wake up the frontest waiter.

Fixes: https://tracker.ceph.com/issues/49379
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 66bcb880abe56c08e04876e98d3d751e78f8fd2f)

src/client/Client.cc

index 0695ea2400fffd2cee84aab84584056ef7ff3dc3..e782a8518b083d5d38b714fef002937f38340242 100644 (file)
@@ -9508,8 +9508,15 @@ void Client::lock_fh_pos(Fh *f)
 
 void Client::unlock_fh_pos(Fh *f)
 {
+  ceph_assert(ceph_mutex_is_locked_by_me(client_lock));
+
   ldout(cct, 10) << __func__ << " " << f << dendl;
   f->pos_locked = false;
+  if (!f->pos_waiters.empty()) {
+    // only wake up the oldest waiter
+    auto cond = f->pos_waiters.front();
+    cond->notify_one();
+  }
 }
 
 int Client::uninline_data(Inode *in, Context *onfinish)