From: Sage Weil <sage@redhat.com>
Date: Mon, 29 Jan 2018 23:26:33 +0000 (-0600)
Subject: os/filestore: more efficient waiter tracking
X-Git-Tag: v13.0.2~222^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03213f4ff6caef51e877bea8558fad5aebeb7f04;p=ceph.git

os/filestore: more efficient waiter tracking

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 7e0b0a1ce1de..38f9032ce988 100644
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -6096,9 +6096,10 @@ void FileStore::OpSequencer::_register_apply(Op *o)
   o->registered_apply = true;
   for (auto& t : o->tls) {
     for (auto& i : t.get_object_index()) {
-      ++applying[i.first];
-      dout(20) << __func__ << " " << o << " " << i.first << " now " << applying[i.first]
-	       << dendl;
+      uint32_t key = i.first.hobj.get_hash();
+      applying.emplace(make_pair(key, &i.first));
+      dout(20) << __func__ << " " << o << " " << i.first << " ("
+	       << &i.first << ")" << dendl;
     }
   }
 }
@@ -6108,14 +6109,21 @@ void FileStore::OpSequencer::_unregister_apply(Op *o)
   assert(o->registered_apply);
   for (auto& t : o->tls) {
     for (auto& i : t.get_object_index()) {
-      auto p = applying.find(i.first);
-      assert(p != applying.end());
-      if (--p->second == 0) {
-	dout(20) << __func__ << " " << o << " " << i.first << " now 0, removing" << dendl;
-	applying.erase(p);
-      } else {
-	dout(20) << __func__ << " " << o << " " << i.first << " now " << p->second << dendl;
+      uint32_t key = i.first.hobj.get_hash();
+      auto p = applying.find(key);
+      bool removed = false;
+      while (p != applying.end() &&
+	     p->first == key) {
+	if (p->second == &i.first) {
+	  dout(20) << __func__ << " " << o << " " << i.first << " ("
+		   << &i.first << ")" << dendl;
+	  applying.erase(p);
+	  removed = true;
+	  break;
+	}
+	++p;
       }
+      assert(removed);
     }
   }
 }
@@ -6123,9 +6131,22 @@ void FileStore::OpSequencer::_unregister_apply(Op *o)
 void FileStore::OpSequencer::wait_for_apply(const ghobject_t& oid)
 {
   Mutex::Locker l(qlock);
-  while (applying.count(oid)) {
-    dout(20) << __func__ << " " << oid << " waiting" << dendl;
-    cond.Wait(qlock);
+  uint32_t key = oid.hobj.get_hash();
+retry:
+  while (true) {
+    // search all items in hash slot for a matching object
+    auto p = applying.find(key);
+    while (p != applying.end() &&
+	   p->first == key) {
+      if (*p->second == oid) {
+	dout(20) << __func__ << " " << oid << " waiting on " << p->second
+		 << dendl;
+	cond.Wait(qlock);
+	goto retry;
+      }
+      ++p;
+    }
+    break;
   }
   dout(20) << __func__ << " " << oid << " done" << dendl;
 }
diff --git a/src/os/filestore/FileStore.h b/src/os/filestore/FileStore.h
index b4d2df045aab..efe717811117 100644
--- a/src/os/filestore/FileStore.h
+++ b/src/os/filestore/FileStore.h
@@ -231,7 +231,8 @@ private:
     list<pair<uint64_t, Context*> > flush_commit_waiters;
     Cond cond;
     string osr_name_str;
-    map<ghobject_t,int> applying;
+    /// hash of pointers to ghobject_t's for in-flight writes
+    unordered_multimap<uint32_t,const ghobject_t*> applying;
   public:
     Mutex apply_lock;  // for apply mutual exclusion
     int id;