cephfs: add additional logging to track change_attr of inodes

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit f02b77787e55d0dcfd34597615702bb6402828e7)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 56be2a1108afca8fbe2cb720b21e46d9fca478f4..55e2f088566baeda16b660a0ea1b3bfa076220b5 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1105,6 +1105,7 @@ Inode * Client::add_update_inode(InodeStat *st, utime_t from,
   }
 
   /* always take a newer change attr */
+  ldout(cct, 12) << __func__ << " client inode change_attr: " << in->change_attr << " , mds inodestat change_attr:  " << st->change_attr << dendl;
   if (st->change_attr > in->change_attr)
     in->change_attr = st->change_attr;
 
@@ -8226,7 +8227,7 @@ void Client::fill_statx(Inode *in, unsigned int mask, struct ceph_statx *stx)
 {
   ldout(cct, 10) << __func__ << " on " << in->ino << " snap/dev" << in->snapid
           << " mode 0" << oct << in->mode << dec
-          << " mtime " << in->mtime << " ctime " << in->ctime << dendl;
+          << " mtime " << in->mtime << " ctime " << in->ctime << " change_attr " << in->change_attr << dendl;
   memset(stx, 0, sizeof(struct ceph_statx));
 
   /*

diff --git a/src/client/Inode.cc b/src/client/Inode.cc
index 5c1523f2f427e52410f9de038f4c777a3570d709..51a0b4b1fe499ba26076ac3ff5123ef26fd58d9c 100644 (file)
--- a/src/client/Inode.cc
+++ b/src/client/Inode.cc
@@ -56,6 +56,7 @@ ostream& operator<<(ostream &out, const Inode &in)
       << " btime=" << in.btime
       << " mtime=" << in.mtime
       << " ctime=" << in.ctime
+      << " change_attr=" << in.change_attr
       << " caps=" << ccap_string(in.caps_issued());
   if (!in.caps.empty()) {
     out << "(";

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index b9bbce3daa7aec5f75c3e4de34d07dd5f715cfa1..08053e47fac1dc7e2bd9fcb7134a1ee0888e802d 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3793,7 +3793,9 @@ int CInode::encode_inodestat(bufferlist& bl, Session *session,
   dout(20) << " pfile " << pfile << " pauth " << pauth
           << " plink " << plink << " pxattr " << pxattr
           << " plocal " << plocal
+          << " mtime " << any_i->mtime
           << " ctime " << any_i->ctime
+          << " change_attr " << any_i->change_attr
           << " valid=" << valid << dendl;
 
   // file
@@ -4139,7 +4141,7 @@ void CInode::encode_cap_message(const ref_t<MClientCaps> &m, Capability *cap)
 
   dout(20) << __func__ << " pfile " << pfile
           << " pauth " << pauth << " plink " << plink << " pxattr " << pxattr
-          << " ctime " << i->ctime << dendl;
+          << " mtime " << i->mtime << " ctime " << i->ctime << " change_attr " << i->change_attr << dendl;
 
   i = pfile ? pi:oi;
   m->set_layout(i->layout);

diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index 500a6fc83b1ae5495f65ca2bccb5737ca4654b82..77e8db1d0992bd201b693dab77e9ae2b531bbc24 100644 (file)
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -191,7 +191,9 @@ public:
     out << " size " << size << "/" << max_size;
     if (truncate_seq)
       out << " ts " << truncate_seq << "/" << truncate_size;
-    out << " mtime " << mtime;
+    out << " mtime " << mtime
+        << " ctime " << ctime
+        << " change_attr " << change_attr;
     if (time_warp_seq)
       out << " tws " << time_warp_seq;