]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: remove superfluous warning of releasing lease 872/head
authorYan, Zheng <zheng.z.yan@intel.com>
Tue, 26 Nov 2013 06:41:00 +0000 (14:41 +0800)
committerYan, Zheng <zheng.z.yan@intel.com>
Tue, 26 Nov 2013 06:56:30 +0000 (14:56 +0800)
When receiving the lease release message, it's possible that the lease
has already expired and the corresponding dentry has been trimmed from
the cache.

Fixes #5871

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
src/mds/Locker.cc

index e11bbd8fe9af9d05246453941477b877aa0fcfb9..63e0e084033ffe463242bfbdb9dc0d5967f3b0ac 100644 (file)
@@ -2518,13 +2518,16 @@ void Locker::process_request_cap_release(MDRequest *mdr, client_t client, const
       if (dn) {
        ClientLease *l = dn->get_client_lease(client);
        if (l) {
-         dout(10) << " removing lease on " << *dn << dendl;
+         dout(10) << "process_cap_release removing lease on " << *dn << dendl;
          dn->remove_client_lease(l, this);
+       } else {
+         dout(7) << "process_cap_release client." << client
+                 << " doesn't have lease on " << *dn << dendl;
        }
       } else {
-       mds->clog.warn() << "client." << client << " released lease on dn "
-           << dir->dirfrag() << "/" << dname << " which dne\n";
-     }
+       dout(7) << "process_cap_release client." << client << " released lease on dn "
+               << dir->dirfrag() << "/" << dname << " which dne" << dendl;
+      }
     }
   }
 
@@ -2532,7 +2535,7 @@ void Locker::process_request_cap_release(MDRequest *mdr, client_t client, const
   if (!cap)
     return;
 
-  dout(10) << "process_cap_update client." << client << " " << ccap_string(caps) << " on " << *in
+  dout(10) << "process_cap_release client." << client << " " << ccap_string(caps) << " on " << *in
           << (mdr ? "" : " (DEFERRED, no mdr)")
           << dendl;