bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

locator: Fix get token from a range<token>

Browse Source 
With a range{t1, t2}, if t2 == {}, the range.end() will contain no
value. Fix getting t2 in this case.

Fixes #911.
Message-Id: <4462e499d706d275c03b116c4645e8aaee7821e1.1456128310.git.asias@scylladb.com>
This commit is contained in:
Asias He
2016-02-22 08:50:36 +00:00
committed by Tomasz Grabiec
parent 4a4074ad21
commit f7fccc6efb
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
locator/token_metadata.cc
View File

@@ -398,7 +398,7 @@ void token_metadata::calculate_pending_ranges(abstract_replication_strategy& str
// all leaving nodes are gone.
auto metadata = clone_only_token_map(); // don't do this in the loop! #7758
for (const auto& r : affected_ranges) {
auto t = r.end()->value();
auto t = r.end() ? r.end()->value() : dht::maximum_token();
auto current_endpoints = strategy.calculate_natural_endpoints(t, metadata);
auto new_endpoints = strategy.calculate_natural_endpoints(t, all_left_metadata);
std::vector<inet_address> diff;

14
service/storage_service.cc
View File

@@ -1981,7 +1981,8 @@ std::unordered_multimap<range<token>, inet_address> storage_service::get_changed
auto metadata = _token_metadata.clone_only_token_map(); // don't do this in the loop! #7758
for (auto& r : ranges) {
auto& ks = _db.local().find_keyspace(keyspace_name);
auto eps = ks.get_replication_strategy().calculate_natural_endpoints(r.end()->value(), metadata);
auto end_token = r.end() ? r.end()->value() : dht::maximum_token();
auto eps = ks.get_replication_strategy().calculate_natural_endpoints(end_token, metadata);
current_replica_endpoints.emplace(r, std::move(eps));
}
@@ -2002,7 +2003,8 @@ std::unordered_multimap<range<token>, inet_address> storage_service::get_changed
// range.
for (auto& r : ranges) {
auto& ks = _db.local().find_keyspace(keyspace_name);
auto new_replica_endpoints = ks.get_replication_strategy().calculate_natural_endpoints(r.end()->value(), temp);
auto end_token = r.end() ? r.end()->value() : dht::maximum_token();
auto new_replica_endpoints = ks.get_replication_strategy().calculate_natural_endpoints(end_token, temp);
auto rg = current_replica_endpoints.equal_range(r);
for (auto it = rg.first; it != rg.second; it++) {
@@ -2516,8 +2518,9 @@ void storage_service::range_relocator::calculate_to_from_streams(std::unordered_
if (r.contains(to_fetch, dht::token_comparator())) {
std::vector<inet_address> endpoints;
if (dht::range_streamer::use_strict_consistency()) {
auto end_token = to_fetch.end() ? to_fetch.end()->value() : dht::maximum_token();
std::vector<inet_address> old_endpoints = eps;
std::vector<inet_address> new_endpoints = strategy.calculate_natural_endpoints(to_fetch.end()->value(), token_meta_clone_all_settled);
std::vector<inet_address> new_endpoints = strategy.calculate_natural_endpoints(end_token, token_meta_clone_all_settled);
//Due to CASSANDRA-5953 we can have a higher RF then we have endpoints.
//So we need to be careful to only be strict when endpoints == RF
@@ -2576,8 +2579,9 @@ void storage_service::range_relocator::calculate_to_from_streams(std::unordered_
std::unordered_multimap<inet_address, range<token>> endpoint_ranges;
std::unordered_map<inet_address, std::vector<range<token>>> endpoint_ranges_map;
for (range<token> to_stream : ranges_per_keyspace.first) {
std::vector<inet_address> current_endpoints = strategy.calculate_natural_endpoints(to_stream.end()->value(), token_meta_clone);
std::vector<inet_address> new_endpoints = strategy.calculate_natural_endpoints(to_stream.end()->value(), token_meta_clone_all_settled);
auto end_token = to_stream.end() ? to_stream.end()->value() : dht::maximum_token();
std::vector<inet_address> current_endpoints = strategy.calculate_natural_endpoints(end_token, token_meta_clone);
std::vector<inet_address> new_endpoints = strategy.calculate_natural_endpoints(end_token, token_meta_clone_all_settled);
logger.debug("Range: {} Current endpoints: {} New endpoints: {}", to_stream, current_endpoints, new_endpoints);
std::sort(current_endpoints.begin(), current_endpoints.end());
std::sort(new_endpoints.begin(), new_endpoints.end());