mds: fix _freeze_dir assert for refragment case

The is_freezeable_dir() is true at freeze time but not forever after over
the lifetime of the freeze.  We split later on and _freeze_dir on the new
fragments, so this assertion isn't necessarily true then.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index a93664ecb1faa03a7bfca08c4cc1f46c43bce12d..0b528fff770c25f49ee04ed414e2da31441bcd09 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -2442,7 +2442,9 @@ bool CDir::freeze_dir()
 void CDir::_freeze_dir()
 {
   dout(10) << "_freeze_dir " << *this << dendl;
-  assert(is_freezeable_dir(true));
+  //assert(is_freezeable_dir(true));
+  // not always true during split because the original fragment may have frozen a while
+  // ago and we're just now getting around to breaking it up.
 
   state_clear(STATE_FREEZINGDIR);
   state_set(STATE_FROZENDIR);