]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: remove wrong assertion
authorYan, Zheng <zheng.z.yan@intel.com>
Thu, 6 Mar 2014 03:25:33 +0000 (11:25 +0800)
committerYan, Zheng <zheng.z.yan@intel.com>
Wed, 19 Mar 2014 03:35:56 +0000 (11:35 +0800)
when handling resolve message, it's possible that bound dirfrags
are missing.

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

index c8afa2ff692b1ccbe610b8097b6d6588f125255f..6b963f2842d767516e155c7425551e55f1345883 100644 (file)
@@ -1086,12 +1086,10 @@ void MDCache::get_force_dirfrag_bound_set(vector<dirfrag_t>& dfs, set<CDir*>& bo
            all = false;
          }
        }
-       if (all) {
+       if (all)
          fgls.push_back(approx_fg);
-       } else {
+       else
          diri->dirfragtree.get_leaves_under(fg, fgls);
-         assert(!fgls.empty());
-       }
       }
       dout(10) << "  frag " << fg << " contains " << fgls << dendl;
       for (list<frag_t>::iterator r = fgls.begin(); r != fgls.end(); ++r) {