From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 31 Jul 2020 21:16:59 +0000 (-0700)
Subject: Merge PR #36257 into master
X-Git-Tag: wip-pdonnell-testing-20200918.022351~486
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f5a28609cf5c79ca31ff22e71bedd25d0351b85;p=ceph-ci.git

Merge PR #36257 into master

* refs/pull/36257/head:
	client: move client_lock to _unmount()
	client: add timer_lock support

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

3f5a28609cf5c79ca31ff22e71bedd25d0351b85
diff --cc src/client/Client.h
index fa53b287d6a,1f6cdb1dee5..f1057e8465d
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@@ -733,18 -732,11 +733,21 @@@ public
    void flush_cap_releases();
    void tick();
  
 +  void cap_hit() {
 +    ++cap_hits;
 +  }
 +  void cap_miss() {
 +    ++cap_misses;
 +  }
 +  std::pair<uint64_t, uint64_t> get_cap_hit_rates() {
 +    return std::make_pair(cap_hits, cap_misses);
 +  }
 +
    xlist<Inode*> &get_dirty_list() { return dirty_list; }
  
+   /* timer_lock for 'timer' and 'tick_event' */
+   ceph::mutex timer_lock = ceph::make_mutex("Client::timer_lock");
+   Context *tick_event = nullptr;
    SafeTimer timer;
  
    std::unique_ptr<PerfCounters> logger;