Merge pull request #18535 from yanghonggang/master

os/bluestore/bluestore_tool: add log-dump command to dump bluefs's log

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>

diff --cc src/os/bluestore/BlueFS.cc
Simple merge

diff --cc src/os/bluestore/BlueFS.h
index ebb76e86f07b3557a67abb5b3411ca3d0770649e,fc8643531412bc14f6a59bdd66e3ee0eb432376e..7c1cfd9beec90911481299cd25c068503c6975e8
--- 1/src/os/bluestore/BlueFS.h
--- 2/src/os/bluestore/BlueFS.h
+++ b/src/os/bluestore/BlueFS.h
@@@ -331,8 -331,13 +331,13 @@@ public
    int mkfs(uuid_d osd_uuid);
    int mount();
    void umount();
+   
+   int log_dump(
+     CephContext *cct,
+     const string& path,
+     const vector<string>& devs);
  
 -  void collect_metadata(map<string,string> *pm);
 +  void collect_metadata(map<string,string> *pm, unsigned skip_bdev_id);
    int fsck();
  
    uint64_t get_fs_usage();

diff --cc src/os/bluestore/bluestore_tool.cc
Simple merge