mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

storage_service: fix range wrapping in describe_ring

Browse Source 
describe_ring() tries to re-wrap the ranges, but fails because the ranges
are not sorted.  Adjust the code not to rely on sorting.
Message-Id: <1478198630-27483-1-git-send-email-avi@scylladb.com>
This commit is contained in:
Avi Kivity
2016-11-03 20:43:50 +02:00
committed by Paweł Dziepak
parent 8afd9e52c7
commit 8fca1887c2
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
service/storage_service.hh
View File

@@ -651,11 +651,18 @@ public:
ranges.push_back(tr);
}
// Convert to wrapping ranges
auto& rf = ranges.front();
auto& rb = ranges.back();
if (rf._start_token.empty() && rb._end_token.empty() && rf._endpoints == rb._endpoints) {
rf._start_token = std::move(rb._start_token);
ranges.pop_back();
auto left_inf = boost::find_if(ranges, [] (const token_range& tr) {
return tr._start_token.empty();
});
auto right_inf = boost::find_if(ranges, [] (const token_range& tr) {
return tr._end_token.empty();
});
if (left_inf != right_inf
&& left_inf != ranges.end()
&& right_inf != ranges.end()
&& left_inf->_endpoints == right_inf->_endpoints) {
left_inf->_start_token = std::move(right_inf->_start_token);
ranges.erase(right_inf);
}
return ranges;
}