mds: drop rdlocks after early reply is sent

We will still hold wrlocks and xlocks until journal entry commits.

diff --git a/src/TODO b/src/TODO
index 5a1ef9307f55628ae94e5a1f840d0ab26858fa30..9385db8fec5dd1dc6697a8cc1fe9f8ff78220c2e 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -6,7 +6,7 @@ v0.6
 
 v0.7
 - ENOSPC
-- async metadata ops
+- fully async file creation
 
 v0.8
 - cas?
@@ -40,7 +40,6 @@ repair
       on cdir store is sufficient if mdlog survives...
   - or what the hell, full trace?
 - mds scrubbing
-/- rados scrubbing
 
 
 timer

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index a7ac68901e8c376b406dd5c83a817af6dc84597b..8556b2b52093fcf2a6e1708a7d041ff41040ab85 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -366,6 +366,12 @@ void Locker::drop_locks(Mutation *mut)
     wrlock_finish(*mut->wrlocks.begin(), mut);
 }
 
+void Locker::drop_rdlocks(Mutation *mut)
+{
+  while (!mut->rdlocks.empty()) 
+    rdlock_finish(*mut->rdlocks.begin(), mut);
+}
+
 
 // generics
 

diff --git a/src/mds/Locker.h b/src/mds/Locker.h
index 7449934472cfa990816ec5a6101d3d329b24e29b..84a27104707cc65091ce4c8494131b7db163cbcd 100644 (file)
--- a/src/mds/Locker.h
+++ b/src/mds/Locker.h
@@ -83,6 +83,7 @@ public:
 
   void drop_locks(Mutation *mut);
   void set_xlocks_done(Mutation *mut);
+  void drop_rdlocks(Mutation *mut);
 
   void eval_gather(SimpleLock *lock);
   void eval_cap_gather(CInode *in);

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 7bb850bec7cb87901dd2e6d9de6e4d1eeca1455b..aed71d1f13cdf1001f59acc3924bf49cec014407 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -554,6 +554,7 @@ void Server::early_reply(MDRequest *mdr, CInode *tracei, CDentry *tracedn)
 
   // mark xlocks "done", indicating that we are exposing uncommitted changes
   mds->locker->set_xlocks_done(mdr);
+  mds->locker->drop_rdlocks(mdr);
 
   mdr->did_early_reply = true;
 }