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

snitch: add optional get_broadcast_address method

Browse Source 
and set broadcast_address / broadcast_rpc_address in main
to remove this dependency of snitch on fb_utilities.

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
This commit is contained in:
Benny Halevy
2023-11-29 16:40:32 +02:00
parent 1d0e71308b
commit 94fc8e2a9a
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
locator/ec2_multi_region_snitch.cc
View File

@@ -20,7 +20,7 @@ static constexpr const char* PRIVATE_MAC_QUERY = "/latest/meta-data/network/inte
namespace locator {
ec2_multi_region_snitch::ec2_multi_region_snitch(const snitch_config& cfg)
: ec2_snitch(cfg)
, _broadcast_rpc_address_specified_by_user(cfg.broadcast_rpc_address_specified_by_user) {}
{}
future<> ec2_multi_region_snitch::start() {
_state = snitch_state::initializing;
@@ -53,17 +53,6 @@ future<> ec2_multi_region_snitch::start() {
}
logger().info("Ec2MultiRegionSnitch using publicIP as identifier: {}", _local_public_address);
//
// Use the Public IP to broadcast Address to other nodes.
//
// Cassandra 2.1 manual explicitly instructs to set broadcast_address
// value to a public address in cassandra.yaml.
//
utils::fb_utilities::set_broadcast_address(_local_public_address);
if (!_broadcast_rpc_address_specified_by_user) {
utils::fb_utilities::set_broadcast_rpc_address(_local_public_address);
}
if (!_local_public_address.addr().is_ipv6()) {
sstring priv_addr = co_await aws_api_call(AWS_QUERY_SERVER_ADDR, AWS_QUERY_SERVER_PORT, PRIVATE_IP_QUERY_REQ, token);
_local_private_address = priv_addr;

3
locator/ec2_multi_region_snitch.hh
View File

@@ -22,6 +22,9 @@ public:
virtual sstring get_name() const override {
return "org.apache.cassandra.locator.Ec2MultiRegionSnitch";
}
virtual std::optional<inet_address> get_public_address() const noexcept override {
return _local_public_address;
}
private:
inet_address _local_public_address;
sstring _local_private_address;

3
locator/snitch_base.hh
View File

@@ -46,7 +46,6 @@ struct snitch_config {
sstring name = "SimpleSnitch";
sstring properties_file_name = "";
unsigned io_cpu_id = 0;
bool broadcast_rpc_address_specified_by_user = false;
// Gossiping-property-file specific
gms::inet_address listen_address;
@@ -78,6 +77,8 @@ public:
};
}
virtual std::optional<inet_address> get_public_address() const noexcept { return std::nullopt; }
/**
* returns whatever info snitch wants to gossip
*/