Reviewed-by: Greg Farnum <greg@xxxxxxxxxxx>
On Sun, Mar 17, 2013 at 7:51 AM, Yan, Zheng <zheng.z.yan@xxxxxxxxx> wrote:
> From: "Yan, Zheng" <zheng.z.yan@xxxxxxxxx>
>
> The active MDS calls MDCache::rejoin_scour_survivor_replicas() when it
> receives the cache rejoin message. The function will remove the objects
> replicated by MDentry{Link,Unlink} from replica map.
>
> Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx>
> ---
> src/mds/MDCache.cc | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
> index 69db1dd..f102205 100644
> --- a/src/mds/MDCache.cc
> +++ b/src/mds/MDCache.cc
> @@ -3893,6 +3893,8 @@ void MDCache::handle_cache_rejoin_weak(MMDSCacheRejoin *weak)
> }
> }
>
> + assert(rejoin_gather.count(from));
> + rejoin_gather.erase(from);
> if (survivor) {
> // survivor. do everything now.
> for (map<inodeno_t,MMDSCacheRejoin::lock_bls>::iterator p = weak->inode_scatterlocks.begin();
> @@ -3911,8 +3913,6 @@ void MDCache::handle_cache_rejoin_weak(MMDSCacheRejoin *weak)
> mds->locker->eval_gather(*p);
> } else {
> // done?
> - assert(rejoin_gather.count(from));
> - rejoin_gather.erase(from);
> if (rejoin_gather.empty()) {
> rejoin_gather_finish();
> } else {
> @@ -9582,7 +9582,9 @@ void MDCache::send_dentry_link(CDentry *dn)
> for (map<int,int>::iterator p = dn->replicas_begin();
> p != dn->replicas_end();
> ++p) {
> - if (mds->mdsmap->get_state(p->first) < MDSMap::STATE_REJOIN)
> + if (mds->mdsmap->get_state(p->first) < MDSMap::STATE_REJOIN ||
> + (mds->mdsmap->get_state(p->first) == MDSMap::STATE_REJOIN &&
> + rejoin_gather.count(p->first)))
> continue;
> CDentry::linkage_t *dnl = dn->get_linkage();
> MDentryLink *m = new MDentryLink(subtree->dirfrag(), dn->get_dir()->dirfrag(),
> @@ -9668,6 +9670,11 @@ void MDCache::send_dentry_unlink(CDentry *dn, CDentry *straydn, MDRequest *mdr)
> if (mdr && mdr->more()->witnessed.count(it->first))
> continue;
>
> + if (mds->mdsmap->get_state(it->first) < MDSMap::STATE_REJOIN ||
> + (mds->mdsmap->get_state(it->first) == MDSMap::STATE_REJOIN &&
> + rejoin_gather.count(it->first)))
> + continue;
> +
> MDentryUnlink *unlink = new MDentryUnlink(dn->get_dir()->dirfrag(), dn->name);
> if (straydn)
> replicate_stray(straydn, it->first, unlink->straybl);
> --
> 1.7.11.7
>
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
