Add More Logging to track total_log_size

Summary: We saw instances where total_log_size is off the real value, but I'm not able to reproduce it. Add more logging to help debugging when it happens again.

Test Plan: Run the unit test and see the logging.

Reviewers: andrewkr, yhchiang, igor, IslamAbdelRahman

Reviewed By: IslamAbdelRahman

Subscribers: leveldb, andrewkr, dhruba

Differential Revision: https://reviews.facebook.net/D60081
main
sdong 9 years ago
parent 01f77cb192
commit a00bf1b3cf
  1. 3
      db/column_family_test.cc
  2. 16
      db/db_impl.cc
  3. 2
      db/db_impl.h
  4. 3
      db/job_context.h

@ -1950,6 +1950,9 @@ TEST_F(ColumnFamilyTest, FlushStaleColumnFamilies) {
// 3 files for default column families, 1 file for column family [two], zero // 3 files for default column families, 1 file for column family [two], zero
// files for column family [one], because it's empty // files for column family [one], because it's empty
AssertCountLiveFiles(4); AssertCountLiveFiles(4);
Flush(0);
ASSERT_EQ(0, dbfull()->TEST_total_log_size());
Close(); Close();
} }

@ -838,6 +838,7 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
if (!alive_log_files_.empty()) { if (!alive_log_files_.empty()) {
uint64_t min_log_number = job_context->log_number; uint64_t min_log_number = job_context->log_number;
size_t num_alive_log_files = alive_log_files_.size();
// find newly obsoleted log files // find newly obsoleted log files
while (alive_log_files_.begin()->number < min_log_number) { while (alive_log_files_.begin()->number < min_log_number) {
auto& earliest = *alive_log_files_.begin(); auto& earliest = *alive_log_files_.begin();
@ -848,6 +849,11 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
} else { } else {
job_context->log_delete_files.push_back(earliest.number); job_context->log_delete_files.push_back(earliest.number);
} }
if (job_context->size_log_to_delete == 0) {
job_context->prev_total_log_size = total_log_size_;
job_context->num_alive_log_files = num_alive_log_files;
}
job_context->size_log_to_delete += earliest.size;
total_log_size_ -= earliest.size; total_log_size_ -= earliest.size;
alive_log_files_.pop_front(); alive_log_files_.pop_front();
// Current log should always stay alive since it can't have // Current log should always stay alive since it can't have
@ -971,6 +977,15 @@ void DBImpl::PurgeObsoleteFiles(const JobContext& state, bool schedule_only) {
std::unique(candidate_files.begin(), candidate_files.end()), std::unique(candidate_files.begin(), candidate_files.end()),
candidate_files.end()); candidate_files.end());
if (state.prev_total_log_size > 0) {
Log(InfoLogLevel::INFO_LEVEL, db_options_.info_log,
"[JOB %d] Try to delete WAL files size %" PRIu64
", prev total WAL file size %" PRIu64
", number of live WAL files %" ROCKSDB_PRIszt ".\n",
state.job_id, state.size_log_to_delete, state.prev_total_log_size,
state.num_alive_log_files);
}
std::vector<std::string> old_info_log_files; std::vector<std::string> old_info_log_files;
InfoLogPrefix info_log_prefix(!db_options_.db_log_dir.empty(), dbname_); InfoLogPrefix info_log_prefix(!db_options_.db_log_dir.empty(), dbname_);
for (const auto& candidate_file : candidate_files) { for (const auto& candidate_file : candidate_files) {
@ -1049,6 +1064,7 @@ void DBImpl::PurgeObsoleteFiles(const JobContext& state, bool schedule_only) {
continue; continue;
} }
#endif // !ROCKSDB_LITE #endif // !ROCKSDB_LITE
Status file_deletion_status; Status file_deletion_status;
if (schedule_only) { if (schedule_only) {
InstrumentedMutexLock guard_lock(&mutex_); InstrumentedMutexLock guard_lock(&mutex_);

@ -341,6 +341,8 @@ class DBImpl : public DB {
uint64_t TEST_LogfileNumber(); uint64_t TEST_LogfileNumber();
uint64_t TEST_total_log_size() const { return total_log_size_; }
// Returns column family name to ImmutableCFOptions map. // Returns column family name to ImmutableCFOptions map.
Status TEST_GetAllImmutableCFOptions( Status TEST_GetAllImmutableCFOptions(
std::unordered_map<std::string, const ImmutableCFOptions*>* iopts_map); std::unordered_map<std::string, const ImmutableCFOptions*>* iopts_map);

@ -76,6 +76,9 @@ struct JobContext {
uint64_t prev_log_number; uint64_t prev_log_number;
uint64_t min_pending_output = 0; uint64_t min_pending_output = 0;
uint64_t prev_total_log_size = 0;
size_t num_alive_log_files = 0;
uint64_t size_log_to_delete = 0;
explicit JobContext(int _job_id, bool create_superversion = false) { explicit JobContext(int _job_id, bool create_superversion = false) {
job_id = _job_id; job_id = _job_id;

Loading…
Cancel
Save