client: always queue the dirty Inode in delayed_list

If the check_caps() won't be trigger for some Inode, the dirty caps
could be kept in the client side for a long time, in some cases it
could make the client hold a lot of caps, which could exceed the
mds's limitation.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit d4c175cd5e0f97ca75ee9e62592ac41e3da9c805)

 Conflicts:
	src/client/Client.cc

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 1944e6081a03e787e4708675f7abc4c9205c55f0..d5993d84159db7385783033d8033518338332ceb 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -3980,6 +3980,7 @@ void Client::check_caps(Inode *in, unsigned flags)
       flush_tid = 0;
     }
 
+    in->delay_cap_item.remove_myself();
     send_cap(in, session, &cap, msg_flags, cap_used, wanted, retain,
             flushing, flush_tid);
   }

diff --git a/src/client/Inode.cc b/src/client/Inode.cc
index da68c24c4393d3e9a993a3b84d41211c20b853b1..2260811f482e5b56347eac68a27981e0d9664fb6 100644 (file)
--- a/src/client/Inode.cc
+++ b/src/client/Inode.cc
@@ -778,6 +778,7 @@ void Inode::mark_caps_dirty(int caps)
     iget();
   dirty_caps |= caps;
   client->get_dirty_list().push_back(&dirty_cap_item);
+  client->cap_delay_requeue(this);
 }
 
 /**