emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[thin_repair/thin_dump] Fix sorting of data mapping candidates

Browse Source 
- Fix the references for sorting. The timestamp statistics is stored
  in node_info corresponding to the second element.
- Fix the timestamp comparison routine. The mapping root with more recent
  blocks should have higher priority.
This commit is contained in:
Ming-Hung Tsai 2021-08-16 18:16:29 +08:00
parent b58e42bb95
commit c286041f25
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
thin-provisioning/metadata_dumper.cc
View File

@ -252,26 +252,33 @@ namespace {
bool cmp_time_counts(pair<node_info, node_info> const &lhs_pair, bool cmp_time_counts(pair<node_info, node_info> const &lhs_pair,
pair<node_info, node_info> const &rhs_pair) { pair<node_info, node_info> const &rhs_pair) {
auto const &lhs = lhs_pair.first.time_counts; auto const &lhs = lhs_pair.second.time_counts;
auto const &rhs = rhs_pair.first.time_counts; auto const &rhs = rhs_pair.second.time_counts;
for (auto lhs_it = lhs.crbegin(); lhs_it != lhs.crend(); lhs_it++) {
for (auto rhs_it = rhs.crbegin(); rhs_it != rhs.crend(); rhs_it++) {
if (lhs_it->first > rhs_it->first)
return true;
else if (rhs_it->first > lhs_it->first) auto lhs_it = lhs.crbegin();
return false; auto rhs_it = rhs.crbegin();
while (lhs_it != lhs.crend() && rhs_it != rhs.crend()) {
else if (lhs_it->second > rhs_it->second) auto lhs_time = lhs_it->first;
return true; auto rhs_time = rhs_it->first;
auto lhs_count = lhs_it->second;
auto rhs_count = rhs_it->second;
else if (rhs_it->second > lhs_it->second) if (lhs_time > rhs_time)
return false; return true;
} else if (rhs_time > lhs_time)
} return false;
else if (lhs_count > rhs_count)
return true;
else if (rhs_count > lhs_count)
return false;
return true; lhs_it++;
rhs_it++;
}
return (lhs_it != lhs.crend()) ? true : false;
} }
class gatherer { class gatherer {