diff mbox

[35/39] mds: clear dirty inode rstat if import fails

Message ID 1363531902-24909-36-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>

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---
 src/mds/CDir.cc     | 1 +
 src/mds/Migrator.cc | 2 ++
 2 files changed, 3 insertions(+)

Comments

Gregory Farnum March 21, 2013, 3:40 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>
>
> Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
> ---
>  src/mds/CDir.cc     | 1 +
>  src/mds/Migrator.cc | 2 ++
>  2 files changed, 3 insertions(+)
>
> diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
> index 34bd8d3..47b6753 100644
> --- a/src/mds/CDir.cc
> +++ b/src/mds/CDir.cc
> @@ -1022,6 +1022,7 @@ void CDir::assimilate_dirty_rstat_inodes()
>    for (elist<CInode*>::iterator p = dirty_rstat_inodes.begin_use_current();
>         !p.end(); ++p) {
>      CInode *in = *p;
> +    assert(in->is_auth());
>      if (in->is_frozen())
>        continue;
>
> diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
> index 0672d03..f563b8d 100644
> --- a/src/mds/Migrator.cc
> +++ b/src/mds/Migrator.cc
> @@ -2052,6 +2052,8 @@ void Migrator::import_reverse(CDir *dir)
>         in->clear_replica_map();
>         if (in->is_dirty())
>           in->mark_clean();
> +       in->clear_dirty_rstat();
> +
>         in->authlock.clear_gather();
>         in->linklock.clear_gather();
>         in->dirfragtreelock.clear_gather();
> --
> 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/CDir.cc b/src/mds/CDir.cc
index 34bd8d3..47b6753 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1022,6 +1022,7 @@  void CDir::assimilate_dirty_rstat_inodes()
   for (elist<CInode*>::iterator p = dirty_rstat_inodes.begin_use_current();
        !p.end(); ++p) {
     CInode *in = *p;
+    assert(in->is_auth());
     if (in->is_frozen())
       continue;
 
diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 0672d03..f563b8d 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -2052,6 +2052,8 @@  void Migrator::import_reverse(CDir *dir)
 	in->clear_replica_map();
 	if (in->is_dirty()) 
 	  in->mark_clean();
+	in->clear_dirty_rstat();
+
 	in->authlock.clear_gather();
 	in->linklock.clear_gather();
 	in->dirfragtreelock.clear_gather();