diff mbox

[32/39] mds: fix export cancel notification

Message ID 1363531902-24909-33-git-send-email-zheng.z.yan@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Yan, Zheng March 17, 2013, 2:51 p.m. UTC 
From: "Yan, Zheng" <zheng.z.yan@intel.com>

The comment says that if the importer is dead, bystanders thinks the
exporter is the only auth, as per mdcache->handle_mds_failure(). But
there is no such code in MDCache::handle_mds_failure().

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---
 src/mds/Migrator.cc | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

Comments

Gregory Farnum March 21, 2013, 3:31 a.m. UTC | #1 
Reviewed-by: Greg Farnum <greg@inktank.com>

On Sun, Mar 17, 2013 at 7:51 AM, Yan, Zheng <zheng.z.yan@intel.com> wrote:
> From: "Yan, Zheng" <zheng.z.yan@intel.com>
>
> The comment says that if the importer is dead, bystanders thinks the
> exporter is the only auth, as per mdcache->handle_mds_failure(). But
> there is no such code in MDCache::handle_mds_failure().
>
> Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
> ---
>  src/mds/Migrator.cc | 20 +++++---------------
>  1 file changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
> index 963706c..40a5394 100644
> --- a/src/mds/Migrator.cc
> +++ b/src/mds/Migrator.cc
> @@ -1390,17 +1390,9 @@ void Migrator::export_logged_finish(CDir *dir)
>    for (set<int>::iterator p = export_notify_ack_waiting[dir].begin();
>         p != export_notify_ack_waiting[dir].end();
>         ++p) {
> -    MExportDirNotify *notify;
> -    if (mds->mdsmap->is_clientreplay_or_active_or_stopping(export_peer[dir]))
> -      // dest is still alive.
> -      notify = new MExportDirNotify(dir->dirfrag(), true,
> -                                   pair<int,int>(mds->get_nodeid(), dest),
> -                                   pair<int,int>(dest, CDIR_AUTH_UNKNOWN));
> -    else
> -      // dest is dead.  bystanders will think i am only auth, as per mdcache->handle_mds_failure()
> -      notify = new MExportDirNotify(dir->dirfrag(), true,
> -                                   pair<int,int>(mds->get_nodeid(), CDIR_AUTH_UNKNOWN),
> -                                   pair<int,int>(dest, CDIR_AUTH_UNKNOWN));
> +    MExportDirNotify *notify = new MExportDirNotify(dir->dirfrag(), true,
> +                                                   pair<int,int>(mds->get_nodeid(), dest),
> +                                                   pair<int,int>(dest, CDIR_AUTH_UNKNOWN));
>
>      for (set<CDir*>::iterator i = bounds.begin(); i != bounds.end(); i++)
>        notify->get_bounds().push_back((*i)->dirfrag());
> @@ -2115,11 +2107,9 @@ void Migrator::import_notify_abort(CDir *dir, set<CDir*>& bounds)
>    for (set<int>::iterator p = import_bystanders[dir].begin();
>         p != import_bystanders[dir].end();
>         ++p) {
> -    // NOTE: the bystander will think i am _only_ auth, because they will have seen
> -    // the exporter's failure and updated the subtree auth.  see mdcache->handle_mds_failure().
> -    MExportDirNotify *notify =
> +    MExportDirNotify *notify =
>        new MExportDirNotify(dir->dirfrag(), true,
> -                          pair<int,int>(mds->get_nodeid(), CDIR_AUTH_UNKNOWN),
> +                          pair<int,int>(import_peer[dir->dirfrag()], mds->get_nodeid()),
>                            pair<int,int>(import_peer[dir->dirfrag()], CDIR_AUTH_UNKNOWN));
>      for (set<CDir*>::iterator i = bounds.begin(); i != bounds.end(); i++)
>        notify->get_bounds().push_back((*i)->dirfrag());
> --
> 1.7.11.7
>
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 963706c..40a5394 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -1390,17 +1390,9 @@  void Migrator::export_logged_finish(CDir *dir)
   for (set<int>::iterator p = export_notify_ack_waiting[dir].begin();
        p != export_notify_ack_waiting[dir].end();
        ++p) {
-    MExportDirNotify *notify;
-    if (mds->mdsmap->is_clientreplay_or_active_or_stopping(export_peer[dir])) 
-      // dest is still alive.
-      notify = new MExportDirNotify(dir->dirfrag(), true,
-				    pair<int,int>(mds->get_nodeid(), dest),
-				    pair<int,int>(dest, CDIR_AUTH_UNKNOWN));
-    else 
-      // dest is dead.  bystanders will think i am only auth, as per mdcache->handle_mds_failure()
-      notify = new MExportDirNotify(dir->dirfrag(), true,
-				    pair<int,int>(mds->get_nodeid(), CDIR_AUTH_UNKNOWN),
-				    pair<int,int>(dest, CDIR_AUTH_UNKNOWN));
+    MExportDirNotify *notify = new MExportDirNotify(dir->dirfrag(), true,
+						    pair<int,int>(mds->get_nodeid(), dest),
+						    pair<int,int>(dest, CDIR_AUTH_UNKNOWN));
 
     for (set<CDir*>::iterator i = bounds.begin(); i != bounds.end(); i++)
       notify->get_bounds().push_back((*i)->dirfrag());
@@ -2115,11 +2107,9 @@  void Migrator::import_notify_abort(CDir *dir, set<CDir*>& bounds)
   for (set<int>::iterator p = import_bystanders[dir].begin();
        p != import_bystanders[dir].end();
        ++p) {
-    // NOTE: the bystander will think i am _only_ auth, because they will have seen
-    // the exporter's failure and updated the subtree auth.  see mdcache->handle_mds_failure().
-    MExportDirNotify *notify = 
+    MExportDirNotify *notify =
       new MExportDirNotify(dir->dirfrag(), true,
-			   pair<int,int>(mds->get_nodeid(), CDIR_AUTH_UNKNOWN),
+			   pair<int,int>(import_peer[dir->dirfrag()], mds->get_nodeid()),
 			   pair<int,int>(import_peer[dir->dirfrag()], CDIR_AUTH_UNKNOWN));
     for (set<CDir*>::iterator i = bounds.begin(); i != bounds.end(); i++)
       notify->get_bounds().push_back((*i)->dirfrag());