Yep. 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> > > Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx> > --- > src/mds/Migrator.cc | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc > index d626cb1..143d71e 100644 > --- a/src/mds/Migrator.cc > +++ b/src/mds/Migrator.cc > @@ -238,7 +238,7 @@ void Migrator::handle_mds_failure_or_stop(int who) > export_unlock(dir); > export_locks.erase(dir); > dir->state_clear(CDir::STATE_EXPORTING); > - if (export_peer[dir] != who) // tell them. > + if (mds->mdsmap->is_clientreplay_or_active_or_stopping(export_peer[dir])) // tell them. > mds->send_message_mds(new MExportDirCancel(dir->dirfrag()), export_peer[dir]); > break; > > @@ -247,7 +247,7 @@ void Migrator::handle_mds_failure_or_stop(int who) > dir->unfreeze_tree(); // cancel the freeze > export_state.erase(dir); // clean up > dir->state_clear(CDir::STATE_EXPORTING); > - if (export_peer[dir] != who) // tell them. > + if (mds->mdsmap->is_clientreplay_or_active_or_stopping(export_peer[dir])) // tell them. > mds->send_message_mds(new MExportDirCancel(dir->dirfrag()), export_peer[dir]); > break; > > @@ -278,7 +278,7 @@ void Migrator::handle_mds_failure_or_stop(int who) > export_unlock(dir); > export_locks.erase(dir); > dir->state_clear(CDir::STATE_EXPORTING); > - if (export_peer[dir] != who) // tell them. > + if (mds->mdsmap->is_clientreplay_or_active_or_stopping(export_peer[dir])) // tell them. > mds->send_message_mds(new MExportDirCancel(dir->dirfrag()), export_peer[dir]); > break; > > -- > 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
