Skip to content

Expose new joiner in replication status #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuwmao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose new joiner in replication status #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class HomestoreConan(ConanFile):
name = "homestore"
version = "6.6.24"
version = "6.6.26"

homepage = "https://github.com/eBay/Homestore"
description = "HomeStore Storage Engine"
Expand Down
1 change: 1 addition & 0 deletions src/include/homestore/replication/repl_decls.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ struct peer_info {
uint64_t replication_idx_;
// The elapsed time since the last successful response from this peer, set to 0 on leader
uint64_t last_succ_resp_us_;
bool is_new_joiner{false};
};

struct replica_member_info {
Expand Down
15 changes: 11 additions & 4 deletions src/lib/replication/repl_dev/raft_repl_dev.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,9 +1118,16 @@ std::vector< peer_info > RaftReplDev::get_replication_status() const {
std::vector< peer_info > pi;
auto rep_status = m_repl_svc_ctx->get_raft_status();
for (auto const& pinfo : rep_status) {
pi.emplace_back(peer_info{.id_ = boost::lexical_cast< replica_id_t >(pinfo.id_),
.replication_idx_ = pinfo.last_log_idx_,
.last_succ_resp_us_ = pinfo.last_succ_resp_us_});
auto peer = peer_info{.id_ = boost::lexical_cast< replica_id_t >(pinfo.id_),
.replication_idx_ = pinfo.last_log_idx_,
.last_succ_resp_us_ = pinfo.last_succ_resp_us_};
auto srv_cfg = raft_server()->get_srv_config(nuraft_mesg::to_server_id(peer.id_));
if (srv_cfg) {
peer.is_new_joiner = srv_cfg->is_new_joiner();
} else {
RD_LOGI("server is not in the config, id={}, raft id:{}", peer.id_, nuraft_mesg::to_server_id(peer.id_));
}
pi.emplace_back(peer);
}
return pi;
}
Expand Down Expand Up @@ -1152,7 +1159,7 @@ std::set< replica_id_t > RaftReplDev::get_active_peers() const {
uint32_t RaftReplDev::get_blk_size() const { return data_service().get_blk_size(); }

nuraft_mesg::repl_service_ctx* RaftReplDev::group_msg_service() { return m_repl_svc_ctx.get(); }
nuraft::raft_server* RaftReplDev::raft_server() { return m_repl_svc_ctx->_server; }
nuraft::raft_server* RaftReplDev::raft_server() const { return m_repl_svc_ctx->_server; }

/////////////////////////////////// Config Serialize/Deserialize Section ////////////////////////////////////
static nlohmann::json serialize_server_config(std::list< nuraft::ptr< nuraft::srv_config > > const& server_list) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/replication/repl_dev/raft_repl_dev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class RaftReplDev : public ReplDev,
//////////////// Accessor/shortcut methods ///////////////////////
nuraft_mesg::repl_service_ctx *group_msg_service();

nuraft::raft_server* raft_server();
nuraft::raft_server* raft_server() const;
RaftReplDevMetrics& metrics() { return m_metrics; }

//////////////// Methods needed for other Raft classes to access /////////////////
Expand Down