mds: CDir: Implement scrub_dentries_scrubbing()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index a3cfdf6ace2f3b0a6ab620ac536afd3231479111..930ecb43820e3ea9cd6b262e7b3226a29a1dbd20 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -2996,6 +2996,28 @@ int CDir::scrub_dentry_next(MDSInternalContext *cb, CDentry **dnout)
   return rval;
 }
 
+void CDir::scrub_dentries_scrubbing(list<CDentry*> *out_dentries)
+{
+  dout(20) << __func__ << dendl;
+  assert(scrub_infop && scrub_infop->directory_scrubbing);
+
+  for (set<dentry_key_t>::iterator i =
+        scrub_infop->directories_scrubbing.begin();
+      i != scrub_infop->directories_scrubbing.end();
+      ++i) {
+    CDentry *d = lookup(i->name, i->snapid);
+    assert(d);
+    out_dentries->push_back(d);
+  }
+  for (set<dentry_key_t>::iterator i = scrub_infop->others_scrubbing.begin();
+      i != scrub_infop->others_scrubbing.end();
+      ++i) {
+    CDentry *d = lookup(i->name, i->snapid);
+    assert(d);
+    out_dentries->push_back(d);
+  }
+}
+
 void CDir::scrub_dentry_finished(CDentry *dn)
 {
   dout(20) << __func__ << " on dn " << *dn << dendl;

diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index c014fa467ea5adee6522788e525d0ea20df53971..6b578892b7f7b1a706412ded4724f16dceea3576 100644 (file)
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -286,6 +286,12 @@ public:
    * @returns a value as described above
    */
   int scrub_dentry_next(MDSInternalContext *cb, CDentry **dnout);
+  /**
+   * Get the currently scrubbing dentries. When returned, the passed-in
+   * list will be filled with all CDentry * which have been returned
+   * from scrub_dentry_next() but not sent back via scrub_dentry_finished().
+   */
+  void scrub_dentries_scrubbing(list<CDentry*> *out_dentries);
   /**
    * Report to the CDir that a CDentry has been scrubbed. Call this
    * for every CDentry returned from scrub_dentry_next().