mds: properly put PIN_IMPORTBOUND when import aborts

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

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index dedd3bea46b0ec234c17ad25aaaa143a095691c9..e55a3b266db0786c611b9b6a7ff18ea21ba40555 100644 (file)
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -2396,12 +2396,17 @@ void Migrator::import_remove_pins(CDir *dir, set<CDir*>& bounds)
     in->put_stickydirs();
   }
 
-  if (stat.state >= IMPORT_PREPPED) {
+  if (stat.state == IMPORT_PREPPING) {
+    for (auto bd : bounds) {
+      if (bd->state_test(CDir::STATE_IMPORTBOUND)) {
+       bd->put(CDir::PIN_IMPORTBOUND);
+       bd->state_clear(CDir::STATE_IMPORTBOUND);
+      }
+    }
+  } else if (stat.state >= IMPORT_PREPPED) {
     // bounding dirfrags
-    for (set<CDir*>::iterator it = bounds.begin();
-        it != bounds.end();
-        ++it) {
-      CDir *bd = *it;
+    for (auto bd : bounds) {
+      assert(bd->state_test(CDir::STATE_IMPORTBOUND));
       bd->put(CDir::PIN_IMPORTBOUND);
       bd->state_clear(CDir::STATE_IMPORTBOUND);
     }