From a31d3aa7ee8bdec70f0766c396747dfb54f86edc Mon Sep 17 00:00:00 2001
From: Asias He <asias@cloudius-systems.com>
Date: Fri, 11 Sep 2015 15:04:58 +0800
Subject: [PATCH] gossip: Pass reference in mark_alive and real_mark_alive

We need to modify the state.
---
 gms/gossiper.cc | 6 +++---
 gms/gossiper.hh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gms/gossiper.cc b/gms/gossiper.cc
index ebfb79c04d..dc4b961d46 100644
--- a/gms/gossiper.cc
+++ b/gms/gossiper.cc
@@ -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
diff --git a/gms/gossiper.hh b/gms/gossiper.hh
index efbf5118bf..6c9328817b 100644
--- a/gms/gossiper.hh
+++ b/gms/gossiper.hh
@@ -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);