From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 6 Dec 2017 19:45:31 +0000 (-0800)
Subject: Merge PR #18791 into master
X-Git-Tag: v13.0.2~852
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9867d81f53c201b5ce521f38b194c6426edb4162;p=ceph.git

Merge PR #18791 into master

* refs/pull/18791/head:
	mds: bump protocol for snapshot changes
	mds: force client to do snapflush
	mds: check existance of snaps when rebuilding need_snapflush
	mds: properly setup need_snapflush for flushsnap messages
	mds: properly update CInode::first and CDentry first
	mds: don't create snap inode during trans-authority rename
	mds: trim non-auth snap dentry during cache rejoin
	mds: detach unlinked inode's snaprealm from its parent
	mds: fix CInode::find_snaprealm()
	mds: fix snap dentry discover
	mds: introduce MDSMap::get_mds_set_lower_bound()
	mds: properly distinguish snaptable TABLE_OP_CREATE from TABLE_OP_UPDATE
	mds: properly set reply buffer for table request 'agree' message
	mds: make change to mds table after corresponding event get logged

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

9867d81f53c201b5ce521f38b194c6426edb4162
diff --cc src/mds/Locker.cc
index 7d617b4f19c,ad76f34132b..e0791dd6cb1
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@@ -3576,12 -3648,12 +3644,12 @@@ void Locker::caps_tick(
  
      utime_t age = now - cap->get_last_revoke_stamp();
      dout(20) << __func__ << " age = " << age << cap->get_client() << "." << cap->get_inode()->ino() << dendl;
 -    if (age <= g_conf->mds_revoke_cap_timeout) {
 -      dout(20) << __func__ << " age below timeout " << g_conf->mds_revoke_cap_timeout << dendl;
 +    if (age <= g_conf->mds_session_timeout) {
 +      dout(20) << __func__ << " age below timeout " << g_conf->mds_session_timeout << dendl;
        break;
      } else {
-       ++i;
-       if (i > MAX_WARN_CAPS) {
+       ++n;
+       if (n > MAX_WARN_CAPS) {
          dout(1) << __func__ << " more than " << MAX_WARN_CAPS << " caps are late"
            << "revoking, ignoring subsequent caps" << dendl;
          break;