From b2099389d5bc75e6d565f2a34a948f7d77804245 Mon Sep 17 00:00:00 2001
From: Yaroslav Dynnikov <yaroslav.dynnikov@gmail.com>
Date: Wed, 20 Apr 2022 10:22:23 +0300
Subject: [PATCH] Address review comments: cleanup entrypoint struct
---
src/main.rs | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index ab8276c0c1..2387486381 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -172,17 +172,15 @@ fn main() {
#[derive(Debug, Serialize, Deserialize)]
enum Entrypoint {
- StartDiscover(),
- StartJoin { leader_uri: String },
- // StartBoot(),
+ StartDiscover,
+ StartJoin { leader_address: String },
}
impl Entrypoint {
fn exec(self, supervisor: Supervisor) {
match self {
- Self::StartDiscover() => start_discover(supervisor),
- Self::StartJoin { leader_uri } => start_join(leader_uri, supervisor),
- // Self::StartBoot() => start_boot(supervisor),
+ Self::StartDiscover => start_discover(supervisor),
+ Self::StartJoin { leader_address } => start_join(leader_address, supervisor),
}
}
}
@@ -338,7 +336,9 @@ fn start_discover(supervisor: Supervisor) {
// }
}
discovery::Role::NonLeader { leader } => {
- let next_entrypoint = Entrypoint::StartJoin { leader_uri: leader };
+ let next_entrypoint = Entrypoint::StartJoin {
+ leader_address: leader,
+ };
IpcMessage {
next_entrypoint,
drop_db: true,
@@ -420,8 +420,8 @@ fn start_boot(supervisor: Supervisor) {
postjoin(supervisor)
}
-fn start_join(leader_uri: String, supervisor: Supervisor) {
- tlog!(Info, ">>>>> start_join({leader_uri})");
+fn start_join(leader_address: String, supervisor: Supervisor) {
+ tlog!(Info, ">>>>> start_join({leader_address})");
let args = &supervisor.args;
let req = traft::node::JoinRequest {
@@ -433,7 +433,8 @@ fn start_join(leader_uri: String, supervisor: Supervisor) {
use traft::node::raft_join;
let fn_name = stringify_cfunc!(raft_join);
- let resp: traft::node::JoinResponse = tarantool::net_box_call_retry(&leader_uri, fn_name, &req);
+ let resp: traft::node::JoinResponse =
+ tarantool::net_box_call_retry(&leader_address, fn_name, &req);
picolib_setup(args);
assert!(tarantool::cfg().is_none());
--
GitLab