]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "mds: handle importer failure on exporter"
authorSage Weil <sage@newdream.net>
Wed, 13 Jul 2011 16:26:54 +0000 (09:26 -0700)
committerSage Weil <sage@newdream.net>
Wed, 13 Jul 2011 16:26:54 +0000 (09:26 -0700)
This reverts commit bf768cb146b23d345efcc51badfe668bf37d4046.

This won't actually happen with f44cffdb8ccc8cf258b418146dbbfc20a9b685f9

src/mds/Migrator.cc

index b7e3d48a9169e40070443fe43a99e56f1ac465ed..d25d77b702aa21cef5ae213b62017bef6c18b071 100644 (file)
@@ -1245,18 +1245,11 @@ public:
 void Migrator::handle_export_ack(MExportDirAck *m)
 {
   CDir *dir = cache->get_dirfrag(m->get_dirfrag());
-  if (!dir ||
-      export_state.count(dir) == 0 ||
-      export_state[dir] != EXPORT_EXPORTING) {
-    // export must have aborted.  
-    dout(7) << "export must have aborted" << dendl;
-    m->put();
-    return;
-  }
+  assert(dir);
+  assert(dir->is_frozen_tree_root());  // i'm exporting!
 
   // yay!
   dout(7) << "handle_export_ack " << *dir << dendl;
-  assert(dir->is_frozen_tree_root());  // i'm exporting!
 
   export_warning_ack_waiting.erase(dir);