From 2078f639d91fbaa9b89832811315c7c41da25a4b Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 19 Feb 2015 19:48:11 -0800 Subject: [PATCH] test: ceph_test_filejournal Add check of journalq in WriteTrim test Commit all journal entries and check for empty journalq Signed-off-by: David Zafman (cherry picked from commit 8da4d9f6330c57d6b437ea44f54f147075e24195) --- src/os/FileJournal.h | 2 ++ src/test/test_filejournal.cc | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/os/FileJournal.h b/src/os/FileJournal.h index 71d7f2257b5e4..9e07b4046d97d 100644 --- a/src/os/FileJournal.h +++ b/src/os/FileJournal.h @@ -214,6 +214,8 @@ public: } } __attribute__((__packed__, aligned(4))); + bool journalq_empty() { return journalq.empty(); } + private: string fn; diff --git a/src/test/test_filejournal.cc b/src/test/test_filejournal.cc index befe761400db9..5bbaab1c99fb0 100644 --- a/src/test/test_filejournal.cc +++ b/src/test/test_filejournal.cc @@ -360,9 +360,11 @@ TEST(TestFileJournal, WriteTrim) { while (ls.size()) { delete ls.front(); ls.pop_front(); - j.committed_thru(committed); + j.committed_thru(++committed); } + ASSERT_TRUE(j.journalq_empty()); + j.close(); } -- 2.39.5