diff options
| author | Alex <alex@adnab.me> | 2022-12-11 17:25:28 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2022-12-11 17:25:28 +0000 |
| commit | defd7d9e6353e10b0b9d58b66aad4f04e7d50c41 (patch) | |
| tree | e6f35cbe9f3625ce39bdd8b5a32898a6bbc47ba5 /src/model | |
| parent | 35f8e8e2fb34d836174ec6c08806b249e0a2873f (diff) | |
| parent | 533afcf4e13022c46fd21ec51ca2a9969692ef4c (diff) | |
| download | garage-defd7d9e6353e10b0b9d58b66aad4f04e7d50c41.tar.gz garage-defd7d9e6353e10b0b9d58b66aad4f04e7d50c41.zip | |
Merge pull request 'Implement /health admin API endpoint to check node health' (#440) from admin-health-api into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/440
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/garage.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/model/garage.rs b/src/model/garage.rs index 75012952..e34d034f 100644 --- a/src/model/garage.rs +++ b/src/model/garage.rs @@ -8,10 +8,10 @@ use garage_util::background::*; use garage_util::config::*; use garage_util::error::*; +use garage_rpc::replication_mode::ReplicationMode; use garage_rpc::system::System; use garage_block::manager::*; -use garage_table::replication::ReplicationMode; use garage_table::replication::TableFullReplication; use garage_table::replication::TableShardedReplication; use garage_table::*; @@ -34,6 +34,9 @@ pub struct Garage { /// The parsed configuration Garage is running pub config: Config, + /// The replication mode of this cluster + pub replication_mode: ReplicationMode, + /// The local database pub db: db::Db, /// A background job runner @@ -164,12 +167,7 @@ impl Garage { .expect("Invalid replication_mode in config file."); info!("Initialize membership management system..."); - let system = System::new( - network_key, - background.clone(), - replication_mode.replication_factor(), - &config, - )?; + let system = System::new(network_key, background.clone(), replication_mode, &config)?; let data_rep_param = TableShardedReplication { system: system.clone(), @@ -258,6 +256,7 @@ impl Garage { // -- done -- Ok(Arc::new(Self { config, + replication_mode, db, background, system, |