Skip to content

Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences

Ensure that the peering service listens only on internal IP.

kishorenc3ac4cfa44b7b
diff --git a/include/raft_server.h b/include/raft_server.h
index c4e3c82c..4075e6bd 100644
--- a/include/raft_server.h
+++ b/include/raft_server.h
@@ -103,7 +103,7 @@ public:
}
// Starts this node
- int start(const std::string & peering_address, int peering_port, int api_port,
+ int start(const butil::EndPoint & peering_endpoint, int api_port,
int election_timeout_ms, int snapshot_interval_s,
const std::string & raft_dir, const std::string & peers);
diff --git a/src/raft_server.cpp b/src/raft_server.cpp
index da230d24..252f9261 100644
--- a/src/raft_server.cpp
+++ b/src/raft_server.cpp
@@ -17,29 +17,17 @@ void ReplicationClosure::Run() {
// State machine implementation
-int ReplicationState::start(const std::string & peering_address, int peering_port, const int api_port,
+int ReplicationState::start(const butil::EndPoint & peering_endpoint, const int api_port,
int election_timeout_ms, int snapshot_interval_s,
const std::string & raft_dir, const std::string & peers) {
- butil::ip_t peering_ip;
- if(!peering_address.empty()) {
- int ip_conv_status = butil::str2ip(peering_address.c_str(), &peering_ip);
- if(ip_conv_status != 0) {
- LOG(ERROR) << "Failed to parse peering address `" << peering_address << "`";
- return -1;
- }
- } else {
- peering_ip = butil::my_ip();
- }
- butil::EndPoint addr(peering_ip, peering_port);
braft::NodeOptions node_options;
std::string actual_peers = peers;
if(actual_peers.empty()) {
- char str[INET_ADDRSTRLEN];
- inet_ntop(AF_INET, &(addr.ip.s_addr), str, INET_ADDRSTRLEN);
- actual_peers = std::string(str) + ":" + std::to_string(peering_port) + ":" + std::to_string(api_port);
+ std::string ip_str = butil::ip2str(peering_endpoint.ip).c_str();
+ actual_peers = ip_str + ":" + std::to_string(peering_endpoint.port) + ":" + std::to_string(api_port);
}
if(node_options.initial_conf.parse_from(actual_peers) != 0) {
@@ -58,7 +46,7 @@ int ReplicationState::start(const std::string & peering_address, int peering_por
node_options.disable_cli = true;
// api_port is used as the node identifier
- braft::Node* node = new braft::Node("default_group", braft::PeerId(addr, api_port));
+ braft::Node* node = new braft::Node("default_group", braft::PeerId(peering_endpoint, api_port));
std::string snapshot_dir = raft_dir + "/" + snapshot_dir_name;
bool snapshot_exists = dir_enum_count(snapshot_dir) > 0;
@@ -365,7 +353,11 @@ bool ReplicationState::is_alive() const {
braft::NodeStatus node_status;
node->get_status(&node_status);
- return node_status.state == braft::State::STATE_CANDIDATE || node_status.state == braft::State::STATE_LEADER;
+
+ return (node_status.state == braft::State::STATE_LEADER ||
+ node_status.state == braft::State::STATE_TRANSFERRING ||
+ node_status.state == braft::State::STATE_CANDIDATE ||
+ node_status.state == braft::State::STATE_FOLLOWER);
}
void InitSnapshotClosure::Run() {
diff --git a/src/typesense_server_utils.cpp b/src/typesense_server_utils.cpp
index 66a73a3b..5cbe797e 100644
--- a/src/typesense_server_utils.cpp
+++ b/src/typesense_server_utils.cpp
@@ -197,20 +197,35 @@ int start_raft_server(ReplicationState& replication_state, const std::string& st
}
}
+ butil::ip_t peering_ip;
+ if(!peering_address.empty()) {
+ int ip_conv_status = butil::str2ip(peering_address.c_str(), &peering_ip);
+ if(ip_conv_status != 0) {
+ LOG(ERROR) << "Failed to parse peering address `" << peering_address << "`";
+ return -1;
+ }
+ } else {
+ peering_ip = butil::my_ip();
+ std::string ip_str = butil::my_ip_cstr();
+ LOG(INFO) << "ip_str: " << ip_str;
+ }
+
+ butil::EndPoint peering_endpoint(peering_ip, peering_port);
+
// start peering server
brpc::Server raft_server;
- if (braft::add_service(&raft_server, peering_port) != 0) {
+ if (braft::add_service(&raft_server, peering_endpoint) != 0) {
LOG(ERROR) << "Failed to add peering service";
exit(-1);
}
- if (raft_server.Start(peering_port, nullptr) != 0) {
+ if (raft_server.Start(peering_endpoint, nullptr) != 0) {
LOG(ERROR) << "Failed to start peering service";
exit(-1);
}
- if (replication_state.start(peering_address, peering_port, api_port, 1000, 600, state_dir, peer_ips) != 0) {
+ if (replication_state.start(peering_endpoint, api_port, 1000, 600, state_dir, peer_ips) != 0) {
LOG(ERROR) << "Failed to start peering state";
exit(-1);
}