From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Sun, 11 May 2014 05:28:51 +0000 (+0800)
Subject: mds: propagate inode rstat if it has never been propagated
X-Git-Tag: v0.81~15^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58ee556079307b2b7cecc736a95ac5e95b8f164b;p=ceph.git

mds: propagate inode rstat if it has never been propagated

Otherwise the 'last_dirstat_prop' of directory inode keeps in 'never'
state.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 1da8ee76bea..fa90e668f7f 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1978,19 +1978,14 @@ void MDCache::predirty_journal_parents(MutationRef mut, EMetaBlob *blob,
     // delay propagating until later?
     if (!stop && !first &&
 	g_conf->mds_dirstat_min_interval > 0) {
-      if (pin->last_dirstat_prop.sec() > 0) {
-	double since_last_prop = mut->now - pin->last_dirstat_prop;
-	if (since_last_prop < g_conf->mds_dirstat_min_interval) {
-	  dout(10) << "predirty_journal_parents last prop " << since_last_prop
-		   << " < " << g_conf->mds_dirstat_min_interval
-		   << ", stopping" << dendl;
-	  stop = true;
-	} else {
-	  dout(10) << "predirty_journal_parents last prop " << since_last_prop << " ago, continuing" << dendl;
-	}
-      } else {
-	dout(10) << "predirty_journal_parents last prop never, stopping" << dendl;
+      double since_last_prop = mut->now - pin->last_dirstat_prop;
+      if (since_last_prop < g_conf->mds_dirstat_min_interval) {
+	dout(10) << "predirty_journal_parents last prop " << since_last_prop
+		 << " < " << g_conf->mds_dirstat_min_interval
+		 << ", stopping" << dendl;
 	stop = true;
+      } else {
+	dout(10) << "predirty_journal_parents last prop " << since_last_prop << " ago, continuing" << dendl;
       }
     }