From cdd0e87a73637c25e042caa4bd67497dc72c0386 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Thu, 9 Jan 2020 12:58:22 +0800 Subject: [PATCH] os/bluestore/BlueFS: replace flush_log with sync_metadata. Signed-off-by: Jianpeng Ma --- src/os/bluestore/BlueFS.cc | 6 ------ src/os/bluestore/BlueFS.h | 1 - src/test/objectstore/test_bluefs.cc | 8 ++++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 26572052dfa46..e7ccb7c827314 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -2367,12 +2367,6 @@ void BlueFS::_pad_bl(bufferlist& bl) } } -void BlueFS::flush_log() -{ - std::unique_lock l(lock); - flush_bdev(); - _flush_and_sync_log(l); -} int BlueFS::_flush_and_sync_log(std::unique_lock& l, uint64_t want_seq, diff --git a/src/os/bluestore/BlueFS.h b/src/os/bluestore/BlueFS.h index 3ae173f80ffbf..4879ebb9485b3 100644 --- a/src/os/bluestore/BlueFS.h +++ b/src/os/bluestore/BlueFS.h @@ -504,7 +504,6 @@ public: int lock_file(const string& dirname, const string& filename, FileLock **p); int unlock_file(FileLock *l); - void flush_log(); void compact_log(); /// sync any uncommitted state to disk diff --git a/src/test/objectstore/test_bluefs.cc b/src/test/objectstore/test_bluefs.cc index a22b50a09e7ac..ef838ab124f2f 100644 --- a/src/test/objectstore/test_bluefs.cc +++ b/src/test/objectstore/test_bluefs.cc @@ -502,10 +502,10 @@ TEST(BlueFS, test_simple_compaction_sync) { string file = "file."; file.append(to_string(j)); fs.unlink(dir, file); - fs.flush_log(); + fs.sync_metadata(); } ASSERT_EQ(0, fs.rmdir(dir)); - fs.flush_log(); + fs.sync_metadata(); } } fs.compact_log(); @@ -555,10 +555,10 @@ TEST(BlueFS, test_simple_compaction_async) { string file = "file."; file.append(to_string(j)); fs.unlink(dir, file); - fs.flush_log(); + fs.sync_metadata(); } ASSERT_EQ(0, fs.rmdir(dir)); - fs.flush_log(); + fs.sync_metadata(); } } fs.compact_log(); -- 2.39.5