Merge pull request #171 from picodata/add_raft_failover

Add raft failover

Author: alrsorokin

README.md

@@ -177,7 +177,7 @@ hosts:
 
 # failover parameters
 failover:
-  mode: stateful               # (optional) failover mode (stateful, eventual, disabled)
+  mode: stateful               # (optional) failover mode (stateful, eventual, disabled, raft)
   state_provider: stateboard   # (optional) what is serve failover (stateboard, stateful)
   failover_timeout: 60         # (optional) timeout (in seconds), used by membership to mark `suspect` members as `dead`
   fencing_enabled: true        # (optional) abandon leadership when both the state provider quorum and at least one

README.ru.md

@@ -193,7 +193,7 @@ hosts:
 
 # параметры фейловера
 failover:
-  mode: stateful              # (опционально) вариант работы фейловера (stateful, eventual, disabled)
+  mode: stateful              # (опционально) вариант работы фейловера (stateful, eventual, disabled, raft)
   state_provider: stateboard  # (опционально) провайдер предоставляющий фейловер (stateboard, stateful)
   failover_timeout: 60        # (опционально) время (в секундах), определяет время перевода инстанса со статусом `suspect` в статус `dead`
   fencing_enabled: true       # (опционально) если `true`, инстансы будут снимать с себя роль лидера при потере связи с провайдером состояния

configs/cluster.genin.yml

@@ -47,7 +47,7 @@ hosts:
           address: 192.168.16.12
 # Failover management options
 failover:
-  # Failover mode (stateful, eventual, disabled)
+  # Failover mode (stateful, eventual, disabled, raft)
   mode: stateful
   # What is serve failover (stateboard, stateful)
   state_provider: stateboard

docs/examples/cluster.genin.yml

@@ -39,7 +39,7 @@ hosts:
         config:
           address: <<host_address>>                 # Host or instance address (maybe IP or URI)
 failover:
-  mode: stateful                                    # Failover mode (stateful, eventual, disabled)
+  mode: stateful                                    # Failover mode (stateful, eventual, disabled, raft)
   state_provider: stateboard                        # What is serve failover (stateboard, stateful)
   stateboard_params:
     uri: <<host_address_and_port>>                 # Uri on which the stateboard will be available (ip:port)

docs/examples/fd-cluster.genin.yml

@@ -25,7 +25,7 @@ hosts:
         config:
           address: <<host_address>>                 # Host or instance address (maybe IP or URI)
 failover:
-  mode: stateful                                    # Failover mode (stateful, eventual, disabled)
+  mode: stateful                                    # Failover mode (stateful, eventual, disabled, raft)
   state_provider: stateboard                        # What is serve failover (stateboard, stateful)
   stateboard_params:
     uri: <<host_address_and_port>>                 # Uri on which the stateboard will be available (ip:port)

src/task.rs

@@ -233,7 +233,7 @@ pub struct ErrSeqMapping<'a> {
     pub value: &'a Vec<Value>,
 }
 
-impl<'a> std::fmt::Debug for ErrSeqMapping<'a> {
+impl std::fmt::Debug for ErrSeqMapping<'_> {
     fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         formatter.write_str("\n")?;
         self.value.iter().try_for_each(|value| match value {
@@ -271,7 +271,7 @@ pub struct ErrConfMapping<'a> {
     pub value: &'a Mapping,
 }
 
-impl<'a> std::fmt::Debug for ErrConfMapping<'a> {
+impl std::fmt::Debug for ErrConfMapping<'_> {
     fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.value
             .iter()

src/task/args.rs

@@ -62,7 +62,7 @@ pub(super) fn read() -> ArgMatches {
                         .short('m')
                         .action(ArgAction::Set)
                         .default_value("stateful")
-                        .help("(string): failover mode (statefull, eventual, disabled)"),
+                        .help("(string): failover mode (statefull, eventual, disabled, raft)"),
                     Arg::new("failover-state-provider")
                         .long("failover-state-provider")
                         .short('F')
@@ -245,7 +245,7 @@ pub(super) fn read() -> ArgMatches {
                         .short('m')
                         .action(ArgAction::Set)
                         .default_value("stateful")
-                        .help("(string): failover mode (statefull, eventual, disabled)"),
+                        .help("(string): failover mode (statefull, eventual, disabled, raft)"),
                     Arg::new("failover-state-provider")
                         .long("failover-state-provider")
                         .short('F')

src/task/cluster.rs

@@ -287,7 +287,7 @@ impl<'a> TryFrom<&'a Inventory> for Cluster {
                                                 roles: Vec::new(),
                                                 cartridge_extra_env: instance.vars.clone(),
                                                 config: InstanceConfig::from_inventory_host(
-                                                    &instance,
+                                                    instance,
                                                 ),
                                                 vars: instance.vars.clone(),
                                                 view: View::default(),
@@ -355,7 +355,7 @@ impl<'de> Deserialize<'de> for Cluster {
                 hosts: Vec<Host>,
                 #[serde(default)]
                 failover: Failover,
-                vars: Vars,
+                vars: Box<Vars>,
             },
             InvalidCluster(Value),
         }
@@ -373,7 +373,7 @@ impl<'de> Deserialize<'de> for Cluster {
                     .with_binary_port(DEFAULT_BINARY_PORT),
                 topology: topology.check_unique().map_err(serde::de::Error::custom)?,
                 failover,
-                vars,
+                vars: *vars,
                 metadata: ClusterMetadata {
                     paths: Default::default(),
                 },
@@ -627,7 +627,7 @@ impl Cluster {
             ("failover".into(), "# Failover management options".into()),
             (
                 "mode".to_string(),
-                "# Failover mode (stateful, eventual, disabled)".to_string(),
+                "# Failover mode (stateful, eventual, disabled, raft)".to_string(),
             ),
             (
                 "state_provider".to_string(),

src/task/cluster/host/hst.rs

@@ -108,10 +108,7 @@ impl WithHosts<Vec<Host>> for Host {
 
 impl PartialOrd for Host {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        match self.instances.len().partial_cmp(&other.instances.len()) {
-            Some(Ordering::Equal) => self.name.partial_cmp(&other.name),
-            ord => ord,
-        }
+        Some(self.cmp(other))
     }
 }
 
@@ -131,7 +128,7 @@ impl Display for Host {
 
         self.form_structure(depth, &collector);
 
-        let mut table = Builder::from_iter(collector.take().into_iter()).build();
+        let mut table = Builder::from_iter(collector.take()).build();
         table.with(Merge::horizontal());
         table.with(Alignment::center());
 
@@ -685,7 +682,7 @@ impl Host {
             }
         }
 
-        lvl = lvl + 1;
+        lvl += 1;
         for sub_host in self.hosts.iter_mut() {
             sub_host.set_zone(lvl, dc_lvl, zone.clone())
         }
@@ -1009,7 +1006,7 @@ impl From<String> for DomainMember {
     }
 }
 
-impl<'a> From<DomainMember> for Cow<'a, str> {
+impl From<DomainMember> for Cow<'_, str> {
     fn from(val: DomainMember) -> Self {
         match val {
             DomainMember::Domain(name) => Cow::Owned(name),

src/task/cluster/host/mod.rs

@@ -79,11 +79,11 @@ impl Default for IP {
     }
 }
 
-impl ToString for IP {
-    fn to_string(&self) -> String {
+impl std::fmt::Display for IP {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Server(ip) => ip.to_string(),
-            Self::None => String::new(),
+            Self::Server(ip) => write!(f, "{}", ip),
+            Self::None => write!(f, ""),
         }
     }
 }