[QUEUED scylladb next] storage_service: make node's entry non expiring in raft address map

0 views
Skip to first unread message

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 3:13:09 AMJul 1
to scylladb-dev@googlegroups.com, Gleb Natapov
From: Gleb Natapov <gl...@scylladb.com>
Committer: Gleb Natapov <gl...@scylladb.com>
Branch: next

storage_service: make node's entry non expiring in raft address map

Local address map entry should never expire in the address map.

---
diff --git a/service/storage_service.cc b/service/storage_service.cc
--- a/service/storage_service.cc
+++ b/service/storage_service.cc
@@ -2831,8 +2831,10 @@ future<> storage_service::init_address_map(raft_address_map& address_map, gms::g
address_map.add_or_update_entry(raft::server_id(host.uuid()), ip);
}
const auto& topology = get_token_metadata().get_topology();
- address_map.add_or_update_entry(raft::server_id{topology.my_host_id().uuid()},
- topology.my_address(), new_generation);
+ raft::server_id myid{topology.my_host_id().uuid()};
+ address_map.add_or_update_entry(myid,topology.my_address(), new_generation);
+ // Make my entry non expiring
+ address_map.set_nonexpiring(myid);
_raft_ip_address_updater = make_shared<raft_ip_address_updater>(address_map, *this);
_gossiper.register_(_raft_ip_address_updater);
}

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 6:42:59 AMJul 1
to scylladb-dev@googlegroups.com, Gleb Natapov
From: Gleb Natapov <gl...@scylladb.com>
Committer: Gleb Natapov <gl...@scylladb.com>
Branch: master

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 10:20:47 AMJul 1
to scylladb-dev@googlegroups.com, Gleb Natapov
From: Gleb Natapov <gl...@scylladb.com>
Committer: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Branch: next-6.0

storage_service: make node's entry non expiring in raft address map

Local address map entry should never expire in the address map.

(cherry picked from commit 5d8f08c0d7de853a75557f0275a00c1f9c84b9f0)

---
diff --git a/service/storage_service.cc b/service/storage_service.cc
--- a/service/storage_service.cc
+++ b/service/storage_service.cc
@@ -2811,8 +2811,10 @@ future<> storage_service::init_address_map(raft_address_map& address_map, gms::g
Reply all
Reply to author
Forward
0 new messages