From aa074898226f5ff8de4b103df2ca56a679bb05e4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 12 Apr 2011 15:32:17 -0700 Subject: [PATCH] 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 --- src/mds/CDir.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index a93664ecb1faa..0b528fff770c2 100644 --- 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); -- 2.39.5