mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-25 19:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

gossip: Pass reference in mark_alive and real_mark_alive

Browse Source 
We need to modify the state.
This commit is contained in:
Asias He
2015-09-11 15:04:58 +08:00
parent 3d543132a9
commit a31d3aa7ee
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gms/gossiper.cc
View File

@@ -987,7 +987,7 @@ void gossiper::notify_failure_detector(std::map<inet_address, endpoint_state> re
}
// Runs inside seastar::async context
void gossiper::mark_alive(inet_address addr, endpoint_state local_state) {
void gossiper::mark_alive(inet_address addr, endpoint_state& local_state) {
// if (MessagingService.instance().getVersion(addr) < MessagingService.VERSION_20) {
// real_mark_alive(addr, local_state);
// return;
@@ -997,7 +997,7 @@ void gossiper::mark_alive(inet_address addr, endpoint_state local_state) {
shard_id id = get_shard_id(addr);
logger.trace("Sending a EchoMessage to {}", id);
auto ok = make_shared<bool>(false);
ms().send_echo(id).then_wrapped([this, id, local_state = std::move(local_state), ok] (auto&& f) mutable {
ms().send_echo(id).then_wrapped([this, id, ok] (auto&& f) mutable {
try {
f.get();
logger.trace("Got EchoMessage Reply");
@@ -1015,7 +1015,7 @@ void gossiper::mark_alive(inet_address addr, endpoint_state local_state) {
}
// Runs inside seastar::async context
void gossiper::real_mark_alive(inet_address addr, endpoint_state local_state) {
void gossiper::real_mark_alive(inet_address addr, endpoint_state& local_state) {
logger.trace("marking as alive {}", addr);
local_state.mark_alive();
local_state.update_timestamp(); // prevents do_status_check from racing us and evicting if it was down > A_VERY_LONG_TIME

4
gms/gossiper.hh
View File

@@ -340,9 +340,9 @@ public:
void notify_failure_detector(inet_address endpoint, endpoint_state remote_endpoint_state);
private:
void mark_alive(inet_address addr, endpoint_state local_state);
void mark_alive(inet_address addr, endpoint_state& local_state);
void real_mark_alive(inet_address addr, endpoint_state local_state);
void real_mark_alive(inet_address addr, endpoint_state& local_state);
void mark_dead(inet_address addr, endpoint_state& local_state);