diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2012-11-19 10:43:45 +0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-12-01 12:52:23 -0800 |
| commit | 587aec1706b31a3074e35e9799a2a8fefd14c96d (patch) | |
| tree | ab8456376d36ea8d19117bab06b9324e499352c2 | |
| parent | 961bc0c93642bdd4f4aa59ea853ef13b4c11287f (diff) | |
| download | ceph-587aec1706b31a3074e35e9799a2a8fefd14c96d.tar.gz | |
mds: fix assertion in handle_cache_expire
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>
| -rw-r--r-- | src/mds/MDCache.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 32799bde109..55c4b54e218 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -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))); |