]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix assertion in handle_cache_expire
authorYan, Zheng <zheng.z.yan@intel.com>
Mon, 19 Nov 2012 02:43:45 +0000 (10:43 +0800)
committerSage Weil <sage@inktank.com>
Sat, 1 Dec 2012 20:52:23 +0000 (12:52 -0800)
During export, it's possible to get cache expire messages in
DISCOVERING, FREEZING and PREPPING state.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
src/mds/MDCache.cc

index 32799bde1093bdd9e2fc95deca54f0c4fdb6aa84..55c4b54e218e1a5f8d0db9261cf97293db6245e5 100644 (file)
@@ -5928,6 +5928,7 @@ void MDCache::handle_cache_expire(MCacheExpire *m)
        continue;
       }
       assert(!(parent_dir->is_auth() && parent_dir->is_exporting()) ||
+            migrator->get_export_state(parent_dir) <= Migrator::EXPORT_PREPPING ||
              (migrator->get_export_state(parent_dir) == Migrator::EXPORT_WARNING &&
                  !migrator->export_has_warned(parent_dir, from)));