From c5041726f357444da701b4c67fb173c2f6eb8dcb Mon Sep 17 00:00:00 2001 From: Luo Kexue Date: Wed, 27 Sep 2017 22:40:00 +0800 Subject: [PATCH] os/bluestore/BlueFS: Reduce unnecessary operations in collect_metadata Signed-off-by: Luo Kexue --- src/os/bluestore/BlueFS.cc | 6 ++---- src/os/bluestore/BlueFS.h | 2 +- src/os/bluestore/BlueStore.cc | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index e3ffff2600f..5c5caf57171 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -456,14 +456,12 @@ void BlueFS::umount() _shutdown_logger(); } -void BlueFS::collect_metadata(map *pm) +void BlueFS::collect_metadata(map *pm, unsigned skip_bdev_id) { - if (bdev[BDEV_DB]) + if (skip_bdev_id != BDEV_DB && bdev[BDEV_DB]) bdev[BDEV_DB]->collect_metadata("bluefs_db_", pm); if (bdev[BDEV_WAL]) bdev[BDEV_WAL]->collect_metadata("bluefs_wal_", pm); - if (bdev[BDEV_SLOW]) - bdev[BDEV_SLOW]->collect_metadata("bluefs_slow_", pm); } int BlueFS::fsck() diff --git a/src/os/bluestore/BlueFS.h b/src/os/bluestore/BlueFS.h index 36b41b451bb..0947b18e625 100644 --- a/src/os/bluestore/BlueFS.h +++ b/src/os/bluestore/BlueFS.h @@ -333,7 +333,7 @@ public: int mount(); void umount(); - void collect_metadata(map *pm); + void collect_metadata(map *pm, unsigned skip_bdev_id); int fsck(); uint64_t get_fs_usage(); diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index aa1b3847c8e..89659ec1c55 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -6121,7 +6121,7 @@ void BlueStore::collect_metadata(map *pm) if (bluefs) { (*pm)["bluefs"] = "1"; (*pm)["bluefs_single_shared_device"] = stringify((int)bluefs_single_shared_device); - bluefs->collect_metadata(pm); + bluefs->collect_metadata(pm, bluefs_shared_bdev); } else { (*pm)["bluefs"] = "0"; } -- 2.39.5