From: Yan, Zheng Date: Mon, 26 Mar 2018 07:55:02 +0000 (+0800) Subject: mds: make rstat.rctime follow inodes' ctime X-Git-Tag: v12.2.6~154^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3b136dc6df0ece066c7f1f43bbbee3d35c7d596;p=ceph.git mds: make rstat.rctime follow inodes' ctime Fixes: http://tracker.ceph.com/issues/23380 Signed-off-by: "Yan, Zheng" (cherry picked from commit eafce62cae14b346f0c1f62d3f676f076c029f16) Conflicts: src/mds/Server.cc: Resolved in do_rename_rollback --- diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 717779b8d6d6..1b8ff388da99 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -2414,6 +2414,8 @@ bool Locker::check_inode_max_size(CInode *in, bool force_wrlock, pi.inode.rstat.rbytes = new_size; dout(10) << "check_inode_max_size mtime " << pi.inode.mtime << " -> " << new_mtime << dendl; pi.inode.mtime = new_mtime; + if (new_mtime > pi.inode.ctime) + pi.inode.ctime = pi.inode.rstat.rctime = new_mtime; } // use EOpen if the file is still open; otherwise, use EUpdate. @@ -3131,7 +3133,7 @@ void Locker::_update_cap_fields(CInode *in, int dirty, MClientCaps *m, CInode::m if (m->get_ctime() > pi->ctime) { dout(7) << " ctime " << pi->ctime << " -> " << m->get_ctime() << " for " << *in << dendl; - pi->ctime = m->get_ctime(); + pi->ctime = pi->rstat.rctime = m->get_ctime(); } if ((features & CEPH_FEATURE_FS_CHANGE_ATTR) && diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 986f6e6b876c..b833bb493a60 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -4143,7 +4143,7 @@ void Server::handle_client_setattr(MDRequestRef& mdr) } pi.inode.version = cur->pre_dirty(); - pi.inode.ctime = mdr->get_op_stamp(); + pi.inode.ctime = pi.inode.rstat.rctime = mdr->get_op_stamp(); pi.inode.change_attr++; // log + wait @@ -4179,7 +4179,7 @@ void Server::do_open_truncate(MDRequestRef& mdr, int cmode) // prepare auto &pi = in->project_inode(); pi.inode.version = in->pre_dirty(); - pi.inode.mtime = pi.inode.ctime = mdr->get_op_stamp(); + pi.inode.mtime = pi.inode.ctime = pi.inode.rstat.rctime = mdr->get_op_stamp(); pi.inode.change_attr++; uint64_t old_size = std::max(pi.inode.size, mdr->client_request->head.args.open.old_size); @@ -4297,7 +4297,7 @@ void Server::handle_client_setlayout(MDRequestRef& mdr) // add the old pool to the inode pi.inode.add_old_pool(old_layout.pool_id); pi.inode.version = cur->pre_dirty(); - pi.inode.ctime = mdr->get_op_stamp(); + pi.inode.ctime = pi.inode.rstat.rctime = mdr->get_op_stamp(); pi.inode.change_attr++; // log + wait @@ -4650,7 +4650,6 @@ void Server::handle_set_vxattr(MDRequestRef& mdr, CInode *cur, int64_t old_pool = pi.inode.layout.pool_id; pi.inode.add_old_pool(old_pool); pi.inode.layout = layout; - pi.inode.ctime = mdr->get_op_stamp(); pip = &pi.inode; } else if (name.compare(0, 10, "ceph.quota") == 0) { if (!cur->is_dir() || cur->is_root()) { @@ -4706,7 +4705,7 @@ void Server::handle_set_vxattr(MDRequestRef& mdr, CInode *cur, } pip->change_attr++; - pip->ctime = mdr->get_op_stamp(); + pip->ctime = pip->rstat.rctime = mdr->get_op_stamp(); pip->version = cur->pre_dirty(); if (cur->is_file()) pip->update_backtrace(); @@ -4873,7 +4872,7 @@ void Server::handle_client_setxattr(MDRequestRef& mdr) // project update auto &pi = cur->project_inode(true); pi.inode.version = cur->pre_dirty(); - pi.inode.ctime = mdr->get_op_stamp(); + pi.inode.ctime = pi.inode.rstat.rctime = mdr->get_op_stamp(); pi.inode.change_attr++; pi.inode.xattr_version++; auto &px = *pi.xattrs; @@ -4940,7 +4939,7 @@ void Server::handle_client_removexattr(MDRequestRef& mdr) auto &pi = cur->project_inode(true); auto &px = *pi.xattrs; pi.inode.version = cur->pre_dirty(); - pi.inode.ctime = mdr->get_op_stamp(); + pi.inode.ctime = pi.inode.rstat.rctime = mdr->get_op_stamp(); pi.inode.change_attr++; pi.inode.xattr_version++; px.erase(mempool::mds_co::string(boost::string_view(name))); @@ -5334,7 +5333,7 @@ void Server::_link_local(MDRequestRef& mdr, CDentry *dn, CInode *targeti) // project inode update auto &pi = targeti->project_inode(); pi.inode.nlink++; - pi.inode.ctime = mdr->get_op_stamp(); + pi.inode.ctime = pi.inode.rstat.rctime = mdr->get_op_stamp(); pi.inode.change_attr++; pi.inode.version = tipv; @@ -5727,7 +5726,7 @@ void Server::do_link_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef& } // inode - pi.inode.ctime = rollback.old_ctime; + pi.inode.ctime = pi.inode.rstat.rctime = rollback.old_ctime; if (rollback.was_inc) pi.inode.nlink--; else @@ -5998,7 +5997,7 @@ void Server::_unlink_local(MDRequestRef& mdr, CDentry *dn, CDentry *straydn) } mdr->add_projected_inode(in); // do this _after_ my dn->pre_dirty().. we apply that one manually. pi.inode.version = in->pre_dirty(); - pi.inode.ctime = mdr->get_op_stamp(); + pi.inode.ctime = pi.inode.rstat.rctime = mdr->get_op_stamp(); pi.inode.change_attr++; pi.inode.nlink--; if (pi.inode.nlink == 0) @@ -7189,13 +7188,13 @@ void Server::_rename_prepare(MDRequestRef& mdr, if (!silent) { if (spi) { - spi->ctime = mdr->get_op_stamp(); + spi->ctime = spi->rstat.rctime = mdr->get_op_stamp(); spi->change_attr++; if (linkmerge) spi->nlink--; } if (tpi) { - tpi->ctime = mdr->get_op_stamp(); + tpi->ctime = tpi->rstat.rctime = mdr->get_op_stamp(); tpi->change_attr++; { std::string t; @@ -8087,7 +8086,7 @@ void Server::do_rename_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef } else pip = in->get_projected_inode(); if (pip->ctime == rollback.ctime) - pip->ctime = rollback.orig_src.old_ctime; + pip->ctime = pip->rstat.rctime = rollback.orig_src.old_ctime; } if (srcdn && srcdn->authority().first == whoami) { @@ -8124,7 +8123,7 @@ void Server::do_rename_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef } else ti = target->get_projected_inode(); if (ti->ctime == rollback.ctime) - ti->ctime = rollback.orig_dest.old_ctime; + ti->ctime = ti->rstat.rctime = rollback.orig_dest.old_ctime; if (MDS_INO_IS_STRAY(rollback.orig_src.dirfrag.ino)) { if (MDS_INO_IS_STRAY(rollback.orig_dest.dirfrag.ino)) assert(!rollback.orig_dest.ino && !rollback.orig_dest.remote_ino); @@ -8578,7 +8577,7 @@ void Server::handle_client_mksnap(MDRequestRef& mdr) info.stamp = mdr->get_op_stamp(); auto &pi = diri->project_inode(false, true); - pi.inode.ctime = info.stamp; + pi.inode.ctime = pi.inode.rstat.rctime = info.stamp; pi.inode.version = diri->pre_dirty(); // project the snaprealm @@ -8710,7 +8709,7 @@ void Server::handle_client_rmsnap(MDRequestRef& mdr) // journal auto &pi = diri->project_inode(false, true); pi.inode.version = diri->pre_dirty(); - pi.inode.ctime = mdr->get_op_stamp(); + pi.inode.ctime = pi.inode.rstat.rctime = mdr->get_op_stamp(); mdr->ls = mdlog->get_current_segment(); EUpdate *le = new EUpdate(mdlog, "rmsnap"); @@ -8852,7 +8851,7 @@ void Server::handle_client_renamesnap(MDRequestRef& mdr) // journal auto &pi = diri->project_inode(false, true); - pi.inode.ctime = mdr->get_op_stamp(); + pi.inode.ctime = pi.inode.rstat.rctime = mdr->get_op_stamp(); pi.inode.version = diri->pre_dirty(); // project the snaprealm