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

Print the missed last layer in cfstats

Browse Source 
Summary:
Printing compaction stats used to operate on two variable:
number_levels_: for printing the layer
num_levels_to_check: for updating the compaction score

After this commit: 361010d44738de48ffc4fd9add70caa0891a0719 these two are mixed up and as a result the last layer might not be printed out: https://fb.facebook.com/groups/rocksdb.internal/permalink/1315716625143616/

number_levels_ was used to decide which layers to print: 672300f47f/db/internal_stats.cc (L753) but after the patch it is based on the return value of DumpCFMapStats 361010d447/db/internal_stats.cc (L929) which returns num_levels_to_check: 361010d447/db/internal_stats.cc (L917)
Closes https://github.com/facebook/rocksdb/pull/1853

Differential Revision: D4529280

Pulled By: maysamyabandeh

fbshipit-source-id: 3fd9448
This commit is contained in:
Maysam Yabandeh 2017-02-08 10:31:59 -08:00 committed by sdong
parent d19646e1c1
commit 241c45d1df
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/internal_stats.cc
View File

@ -865,7 +865,7 @@ void InternalStats::DumpCFMapStats(std::map<std::string, double>* cf_stats) {
} }
} }
int InternalStats::DumpCFMapStats( void InternalStats::DumpCFMapStats(
std::map<int, std::map<LevelStatType, double>>* levels_stats, std::map<int, std::map<LevelStatType, double>>* levels_stats,
CompactionStats* compaction_stats_sum) { CompactionStats* compaction_stats_sum) {
const VersionStorageInfo* vstorage = cfd_->current()->storage_info(); const VersionStorageInfo* vstorage = cfd_->current()->storage_info();
@ -925,7 +925,6 @@ int InternalStats::DumpCFMapStats(
PrepareLevelStats(&sum_stats, total_files, total_files_being_compacted, PrepareLevelStats(&sum_stats, total_files, total_files_being_compacted,
total_file_size, 0, w_amp, *compaction_stats_sum); total_file_size, 0, w_amp, *compaction_stats_sum);
(*levels_stats)[-1] = sum_stats; // -1 is for the Sum level (*levels_stats)[-1] = sum_stats; // -1 is for the Sum level
return num_levels_to_check;
} }
void InternalStats::DumpCFStats(std::string* value) { void InternalStats::DumpCFStats(std::string* value) {
@ -937,8 +936,8 @@ void InternalStats::DumpCFStats(std::string* value) {
// Print stats for each level // Print stats for each level
std::map<int, std::map<LevelStatType, double>> levels_stats; std::map<int, std::map<LevelStatType, double>> levels_stats;
CompactionStats compaction_stats_sum(0); CompactionStats compaction_stats_sum(0);
int levels = DumpCFMapStats(&levels_stats, &compaction_stats_sum); DumpCFMapStats(&levels_stats, &compaction_stats_sum);
for (int l = 0; l < levels; ++l) { for (int l = 0; l < number_levels_; ++l) {
if (levels_stats.find(l) != levels_stats.end()) { if (levels_stats.find(l) != levels_stats.end()) {
PrintLevelStats(buf, sizeof(buf), "L" + ToString(l), levels_stats[l]); PrintLevelStats(buf, sizeof(buf), "L" + ToString(l), levels_stats[l]);
value->append(buf); value->append(buf);

2
db/internal_stats.h
View File

@ -273,7 +273,7 @@ class InternalStats {
private: private:
void DumpDBStats(std::string* value); void DumpDBStats(std::string* value);
void DumpCFMapStats(std::map<std::string, double>* cf_stats); void DumpCFMapStats(std::map<std::string, double>* cf_stats);
int DumpCFMapStats( void DumpCFMapStats(
std::map<int, std::map<LevelStatType, double>>* level_stats, std::map<int, std::map<LevelStatType, double>>* level_stats,
CompactionStats* compaction_stats_sum); CompactionStats* compaction_stats_sum);
void DumpCFStats(std::string* value); void DumpCFStats(std::string* value);