From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 9 May 2017 08:26:48 +0000 (+0800)
Subject: mds: properly cleanup export states
X-Git-Tag: v12.0.3~38^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6bdd9e7f8bc1f59355f30901b160ffabcc8488f2;p=ceph.git

mds: properly cleanup export states

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

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 5aaea42b0b78..4e8934751d16 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -883,7 +883,7 @@ void Migrator::dispatch_export_dir(MDRequestRef& mdr, int count)
     dout(7) << "dest is not yet an export target" << dendl;
     if (count > 3) {
       dout(5) << "dest has not been added as export target after three MDSMap epochs, canceling export" << dendl;
-      mds->mdcache->request_finish(mdr);
+      export_try_cancel(dir);
       return;
     }
     mds->wait_for_mdsmap(mds->mdsmap->get_epoch(), new C_M_ExportTargetWait(this, mdr, count+1));