From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Mon, 21 Oct 2013 01:06:16 +0000 (+0800)
Subject: mds: update backtrace when old format inode is touched
X-Git-Tag: v0.73~76^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F750%2Fhead;p=ceph.git

mds: update backtrace when old format inode is touched

We updated inode format version to 7 when introducing inode backtrace.
If we found a inode's format version < 7 when fetching the inode, set
the inode's backtrace_version to 0, to indicate the inode's backtrace
is out of data. When touching a inode with backtrace_version == 0, we
also update its backtrace.

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

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 7f8525197149..e11bbd8fe9af 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -2900,6 +2900,10 @@ bool Locker::_do_cap_update(CInode *in, Capability *cap,
 
     wrlock_force(&in->xattrlock, mut);
   }
+
+  // update backtrace for old format inode. (see inode_t::decode)
+  if (pi->backtrace_version == 0)
+    pi->update_backtrace();
   
   mut->auth_pin(in);
   mdcache->predirty_journal_parents(mut, &le->metablob, in, 0, PREDIRTY_PRIMARY, 0, follows);
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 0c500cdfe63f..de0916a644b3 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -3206,6 +3206,11 @@ void Server::handle_client_setattr(MDRequest *mdr)
 
   // log + wait
   le->metablob.add_client_req(req->get_reqid(), req->get_oldest_client_tid());
+
+  // update backtrace for old format inode. (see inode_t::decode)
+  if (pi->backtrace_version == 0)
+    pi->update_backtrace();
+
   mdcache->predirty_journal_parents(mdr, &le->metablob, cur, 0, PREDIRTY_PRIMARY, false);
   mdcache->journal_dirty_inode(mdr, &le->metablob, cur);
   
diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
index 362f74774c40..df6cd8efa9f7 100644
--- a/src/mds/mdstypes.cc
+++ b/src/mds/mdstypes.cc
@@ -295,6 +295,8 @@ void inode_t::decode(bufferlist::iterator &p)
     ::decode(backtrace_version, p);
   if (struct_v >= 7)
     ::decode(old_pools, p);
+  else
+    backtrace_version = 0; // note inode which has no backtrace
   if (struct_v >= 8)
     ::decode(max_size_ever, p);