mds: remove old scrub_dentry code

Signed-off-by: Yan, Zheng <zyan@redhat.com>

diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc
index dab9ee159ebb1511016653c72b8c13ccc6bde652..2fef54168e14cbd8d3b4c2a7fcb72ba3eac36a5d 100644 (file)
--- a/src/common/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -135,8 +135,8 @@ const char *ceph_mds_op_name(int op)
        case CEPH_MDS_OP_GETFILELOCK: return "getfilelock";
        case CEPH_MDS_OP_FRAGMENTDIR: return "fragmentdir";
        case CEPH_MDS_OP_EXPORTDIR: return "exportdir";
-       case CEPH_MDS_OP_VALIDATE: return "validate_path";
        case CEPH_MDS_OP_FLUSH: return "flush_path";
+       case CEPH_MDS_OP_ENQUEUE_SCRUB: return "enqueue_scrub";
        case CEPH_MDS_OP_REPAIR_FRAGSTATS: return "repair_fragstats";
        case CEPH_MDS_OP_REPAIR_INODESTATS: return "repair_inodestats";
        }

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 5fab25961bca7523b839e2e2021dce1ae63c4ece..202664d80e3caff89b2aae89cecb2a8076b5a358 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -353,11 +353,10 @@ enum {
        // internal op
        CEPH_MDS_OP_FRAGMENTDIR= 0x01500,
        CEPH_MDS_OP_EXPORTDIR  = 0x01501,
-       CEPH_MDS_OP_VALIDATE   = 0x01502,
-       CEPH_MDS_OP_FLUSH      = 0x01503,
-       CEPH_MDS_OP_ENQUEUE_SCRUB  = 0x01504,
-       CEPH_MDS_OP_REPAIR_FRAGSTATS = 0x01505,
-       CEPH_MDS_OP_REPAIR_INODESTATS = 0x01506
+       CEPH_MDS_OP_FLUSH      = 0x01502,
+       CEPH_MDS_OP_ENQUEUE_SCRUB  = 0x01503,
+       CEPH_MDS_OP_REPAIR_FRAGSTATS = 0x01504,
+       CEPH_MDS_OP_REPAIR_INODESTATS = 0x01505
 };
 
 extern const char *ceph_mds_op_name(int op);

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 7bf38779505e291a515339c33b2aea24bc40f12f..52ff4827db502cdbbc8b745e3783b79d4e834f79 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3684,11 +3684,10 @@ void InodeStore::generate_test_instances(list<InodeStore*> &ls)
 }
 
 void CInode::validate_disk_state(CInode::validated_data *results,
-                                 MDRequestRef &mdr, MDSInternalContext *fin)
+                                 MDSInternalContext *fin)
 {
   class ValidationContinuation : public MDSContinuation {
   public:
-    MDRequestRef mdr;
     MDSInternalContext *fin;
     CInode *in;
     CInode::validated_data *results;
@@ -3702,17 +3701,10 @@ void CInode::validate_disk_state(CInode::validated_data *results,
       DIRFRAGS
     };
 
-    /**
-     * May set either mdr or fin, depending on whether caller is doing
-     * validation in a single MDRequest (i.e. asok) or caller is doing
-     * their own thing (i.e. ScrubStack)
-     */
     ValidationContinuation(CInode *i,
                            CInode::validated_data *data_r,
-                           MDRequestRef &_mdr,
                            MDSInternalContext *fin_) :
                              MDSContinuation(i->mdcache->mds->server),
-                             mdr(_mdr),
                              fin(fin_),
                              in(i),
                              results(data_r),
@@ -3963,9 +3955,7 @@ next:
          results->backtrace.passed &&
          results->inode.passed)
         results->passed_validation = true;
-      if (mdr) {
-        server->respond_to_request(mdr, get_rval());
-      } else if (fin) {
+      if (fin) {
         fin->complete(get_rval());
       }
       delete this;
@@ -3976,7 +3966,6 @@ next:
   dout(10) << "scrub starting validate_disk_state on " << *this << dendl;
   ValidationContinuation *vc = new ValidationContinuation(this,
                                                           results,
-                                                          mdr,
                                                           fin);
   vc->begin();
 }

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index ca11e0ea6b5b298a340bbfde1a9847aed51612fe..50482964a25b9bca85ad554818c4572fc07fcbd8 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -1108,7 +1108,6 @@ public:
    * @param fin Context to call back on completion (or NULL)
    */
   void validate_disk_state(validated_data *results,
-                           MDRequestRef& mdr,
                            MDSInternalContext *fin);
   static void dump_validation_results(const validated_data& results,
                                       Formatter *f);

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index e1fa92d0d848a143dc6d6d1ee556a7b573a16218..2626ec08940375f18b907a82ec03841fae03c029 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -8842,9 +8842,6 @@ void MDCache::dispatch_request(MDRequestRef& mdr)
     case CEPH_MDS_OP_EXPORTDIR:
       migrator->dispatch_export_dir(mdr);
       break;
-    case CEPH_MDS_OP_VALIDATE:
-      scrub_dentry_work(mdr);
-      break;
     case CEPH_MDS_OP_ENQUEUE_SCRUB:
       enqueue_scrub_work(mdr);
       break;
@@ -11680,60 +11677,6 @@ void C_MDS_RetryRequest::finish(int r)
   cache->dispatch_request(mdr);
 }
 
-class C_scrub_dentry_finish : public Context {
-public:
-  CInode::validated_data results;
-  MDRequestRef mdr;
-  Context *on_finish;
-  Formatter *formatter;
-  C_scrub_dentry_finish(MDRequestRef& mdr,
-                        Context *fin, Formatter *f) :
-    mdr(mdr), on_finish(fin), formatter(f) {}
-
-  void finish(int r) {
-    if (r >= 0) { // we got into the scrubbing dump it
-      results.dump(formatter);
-    } else { // we failed the lookup or something; dump ourselves
-      formatter->open_object_section("results");
-      formatter->dump_int("return_code", r);
-      formatter->close_section(); // results
-    }
-    on_finish->complete(r);
-  }
-};
-
-void MDCache::scrub_dentry(const string& path, Formatter *f, Context *fin)
-{
-  dout(10) << "scrub_dentry " << path << dendl;
-  MDRequestRef mdr = request_start_internal(CEPH_MDS_OP_VALIDATE);
-  filepath fp(path.c_str());
-  mdr->set_filepath(fp);
-  C_scrub_dentry_finish *csd = new C_scrub_dentry_finish(mdr, fin, f);
-  mdr->internal_op_finish = csd;
-  mdr->internal_op_private = &csd->results;
-  scrub_dentry_work(mdr);
-}
-
-void MDCache::scrub_dentry_work(MDRequestRef& mdr)
-{
-  set<SimpleLock*> rdlocks, wrlocks, xlocks;
-  CInode *in = mds->server->rdlock_path_pin_ref(mdr, 0, rdlocks, true);
-  if (NULL == in)
-    return;
-
-  // TODO: Remove this restriction
-  assert(in->is_auth());
-
-  bool locked = mds->locker->acquire_locks(mdr, rdlocks, wrlocks, xlocks);
-  if (!locked)
-    return;
-
-  CInode::validated_data *vr =
-      static_cast<CInode::validated_data*>(mdr->internal_op_private);
-
-  in->validate_disk_state(vr, mdr, NULL);
-  return;
-}
 
 class C_MDS_EnqueueScrub : public Context
 {

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index 2f25dc948b5aeef5129f4024a6c189de8552ea3b..30a382a49c10101a28bdbc2dde0399869cbc7422 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -1130,10 +1130,6 @@ public:
   }
 
 protected:
-  /**
-   * Scrub the named dentry only (skip the scrubstack)
-   */
-  void scrub_dentry_work(MDRequestRef& mdr);
   void flush_dentry_work(MDRequestRef& mdr);
   /**
    * Resolve path to a dentry and pass it onto the ScrubStack.
@@ -1148,7 +1144,6 @@ protected:
   void repair_dirfrag_stats_work(MDRequestRef& mdr);
   friend class C_MDC_RepairDirfragStats;
 public:
-  void scrub_dentry(const string& path, Formatter *f, Context *fin);
   void flush_dentry(const string& path, Context *fin);
   /**
    * Create and start an OP_ENQUEUE_SCRUB

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index fdade7c4b4e9352dd17e5f2998a24d7bfdb2756f..f99b3ed6035eb00e2b0e14151161e6c928ece31f 100644 (file)
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -304,8 +304,7 @@ void ScrubStack::scrub_dir_dentry_final(CDentry *dn)
     dn->scrub_children_finished();
     CInode *in = dn->get_projected_inode();
     C_InodeValidated *fin = new C_InodeValidated(mdcache->mds, this, dn);
-    MDRequestRef null_mdr;
-    in->validate_disk_state(&fin->result, null_mdr, fin);
+    in->validate_disk_state(&fin->result, fin);
   }
 
   return;
@@ -410,8 +409,7 @@ void ScrubStack::scrub_file_dentry(CDentry *dn)
 
   // At this stage the DN is already past scrub_initialize, so
   // it's in the cache, it has PIN_SCRUBQUEUE and it is authpinned
-  MDRequestRef null_mdr;
-  in->validate_disk_state(&fin->result, null_mdr, fin);
+  in->validate_disk_state(&fin->result, fin);
 }
 
 void ScrubStack::_validate_inode_done(CDentry *dn, int r,