andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use condition variable in log roller test

Browse Source 
Summary:
Previously I just slept until the flush_thread was "probably" ready
since proper synchronization in test cases seemed like overkill. But then tsan
complained about it, so I did the synchronization (mostly) properly now.

Test Plan:
  $ COMPILE_WITH_TSAN=1 make -j32 auto_roll_logger_test
  $ ./auto_roll_logger_test

Reviewers: anthony, IslamAbdelRahman, sdong

Reviewed By: sdong

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D54399
This commit is contained in:
Andrew Kryczka 2016-02-18 18:03:53 -08:00
parent 6b2a047dfc
commit d825fc70d4
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
db/auto_roll_logger_test.cc
View File

@ -12,6 +12,8 @@
#include <iterator> #include <iterator>
#include <algorithm> #include <algorithm>
#include "db/auto_roll_logger.h" #include "db/auto_roll_logger.h"
#include "port/port.h"
#include "util/mutexlock.h"
#include "util/sync_point.h" #include "util/sync_point.h"
#include "util/testharness.h" #include "util/testharness.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
@ -291,20 +293,33 @@ TEST_F(AutoRollLoggerTest, LogFlushWhileRolling) {
"PosixLogger::Flush:2"}, "PosixLogger::Flush:2"},
}); });
}); });
port::Mutex flush_thread_mutex;
port::CondVar flush_thread_cv{&flush_thread_mutex};
std::thread flush_thread; std::thread flush_thread;
// Additionally, to exercise the edge case, we need to ensure the old logger // Additionally, to exercise the edge case, we need to ensure the old logger
// is used. For this, we pause after pinning the logger until dependencies // is used. For this, we pause after pinning the logger until dependencies
// have probably been loaded. // have probably been loaded.
const int kWaitForDepsSeconds = 1;
rocksdb::SyncPoint::GetInstance()->SetCallBack( rocksdb::SyncPoint::GetInstance()->SetCallBack(
"AutoRollLogger::Flush:PinnedLogger", [&](void* arg) { "AutoRollLogger::Flush:PinnedLogger", [&](void* arg) {
MutexLock ml{&flush_thread_mutex};
while (flush_thread.get_id() == std::thread::id()) {
flush_thread_cv.Wait();
}
if (std::this_thread::get_id() == flush_thread.get_id()) { if (std::this_thread::get_id() == flush_thread.get_id()) {
sleep(2); Env::Default()->SleepForMicroseconds(kWaitForDepsSeconds * 1000 * 1000);
sleep(1);
} }
}); });
rocksdb::SyncPoint::GetInstance()->EnableProcessing(); rocksdb::SyncPoint::GetInstance()->EnableProcessing();
{
MutexLock ml{&flush_thread_mutex};
flush_thread = std::thread([&]() { auto_roll_logger->Flush(); }); flush_thread = std::thread([&]() { auto_roll_logger->Flush(); });
sleep(1); flush_thread_cv.Signal();
}
RollLogFileBySizeTest(auto_roll_logger, options.max_log_file_size, RollLogFileBySizeTest(auto_roll_logger, options.max_log_file_size,
kSampleMessage + ":LogFlushWhileRolling"); kSampleMessage + ":LogFlushWhileRolling");
flush_thread.join(); flush_thread.join();