From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 26 Oct 2018 19:24:09 +0000 (-0400)
Subject: Merge pull request #22633 from dongbula/add-dbstatistics-for-filestore
X-Git-Tag: v14.1.0~1073
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=135edcc55abf0e6bef91a5d2e185eb16ffde74cd;p=ceph.git

Merge pull request #22633 from dongbula/add-dbstatistics-for-filestore

OSD: add impl for filestore to get dbstatistics

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

135edcc55abf0e6bef91a5d2e185eb16ffde74cd
diff --cc src/os/ObjectMap.h
index 0d0b4bd5ff0c,d0ab79a1147f..f903333ae7de
--- a/src/os/ObjectMap.h
+++ b/src/os/ObjectMap.h
@@@ -162,9 -163,8 +163,9 @@@ public
      return ObjectMapIterator();
    }
  
 +  virtual KeyValueDB *get_db() { return nullptr; }
  
-   ObjectMap(CephContext* cct) : cct(cct) {}
+   ObjectMap(CephContext* cct, KeyValueDB *db) : cct(cct), db(db) {}
    virtual ~ObjectMap() {}
  };
  
diff --cc src/os/filestore/DBObjectMap.h
index 45745ea2e6ff,5aa91a1ba1f0..a471e4304b73
--- a/src/os/filestore/DBObjectMap.h
+++ b/src/os/filestore/DBObjectMap.h
@@@ -56,10 -57,7 +56,9 @@@
   */
  class DBObjectMap : public ObjectMap {
  public:
-   boost::scoped_ptr<KeyValueDB> db;
  
 +  KeyValueDB *get_db() override { return db.get(); }
 +
    /**
     * Serializes access to next_seq as well as the in_use set
     */