From 8af8ec850ee744de6f6e954200969a915179768f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 13 Jul 2011 09:26:54 -0700 Subject: [PATCH] Revert "mds: handle importer failure on exporter" This reverts commit bf768cb146b23d345efcc51badfe668bf37d4046. This won't actually happen with f44cffdb8ccc8cf258b418146dbbfc20a9b685f9 --- src/mds/Migrator.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index b7e3d48a9169e..d25d77b702aa2 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -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); -- 2.39.5