Move block manager to separate module

src/model/Cargo.toml

@@ -16,6 +16,7 @@ path = "lib.rs"
 [dependencies]
 garage_rpc = { version = "0.7.0", path = "../rpc" }
 garage_table = { version = "0.7.0", path = "../table" }
+garage_block = { version = "0.7.0", path = "../block" }
 garage_util = { version = "0.7.0", path = "../util" }
 garage_model_050 = { package = "garage_model", version = "0.5.1" }
 

src/model/block_metrics.rs

@@ -1,102 +0,0 @@
-use opentelemetry::{global, metrics::*};
-
-use garage_util::sled_counter::SledCountedTree;
-
-/// TableMetrics reference all counter used for metrics
-pub struct BlockManagerMetrics {
-	pub(crate) _resync_queue_len: ValueObserver<u64>,
-	pub(crate) _resync_errored_blocks: ValueObserver<u64>,
-
-	pub(crate) resync_counter: BoundCounter<u64>,
-	pub(crate) resync_error_counter: BoundCounter<u64>,
-	pub(crate) resync_duration: BoundValueRecorder<f64>,
-	pub(crate) resync_send_counter: Counter<u64>,
-	pub(crate) resync_recv_counter: BoundCounter<u64>,
-
-	pub(crate) bytes_read: BoundCounter<u64>,
-	pub(crate) block_read_duration: BoundValueRecorder<f64>,
-	pub(crate) bytes_written: BoundCounter<u64>,
-	pub(crate) block_write_duration: BoundValueRecorder<f64>,
-	pub(crate) delete_counter: BoundCounter<u64>,
-
-	pub(crate) corruption_counter: BoundCounter<u64>,
-}
-
-impl BlockManagerMetrics {
-	pub fn new(resync_queue: SledCountedTree, resync_errors: SledCountedTree) -> Self {
-		let meter = global::meter("garage_model/block");
-		Self {
-			_resync_queue_len: meter
-				.u64_value_observer("block.resync_queue_length", move |observer| {
-					observer.observe(resync_queue.len() as u64, &[])
-				})
-				.with_description(
-					"Number of block hashes queued for local check and possible resync",
-				)
-				.init(),
-			_resync_errored_blocks: meter
-				.u64_value_observer("block.resync_errored_blocks", move |observer| {
-					observer.observe(resync_errors.len() as u64, &[])
-				})
-				.with_description("Number of block hashes whose last resync resulted in an error")
-				.init(),
-
-			resync_counter: meter
-				.u64_counter("block.resync_counter")
-				.with_description("Number of calls to resync_block")
-				.init()
-				.bind(&[]),
-			resync_error_counter: meter
-				.u64_counter("block.resync_error_counter")
-				.with_description("Number of calls to resync_block that returned an error")
-				.init()
-				.bind(&[]),
-			resync_duration: meter
-				.f64_value_recorder("block.resync_duration")
-				.with_description("Duration of resync_block operations")
-				.init()
-				.bind(&[]),
-			resync_send_counter: meter
-				.u64_counter("block.resync_send_counter")
-				.with_description("Number of blocks sent to another node in resync operations")
-				.init(),
-			resync_recv_counter: meter
-				.u64_counter("block.resync_recv_counter")
-				.with_description("Number of blocks received from other nodes in resync operations")
-				.init()
-				.bind(&[]),
-
-			bytes_read: meter
-				.u64_counter("block.bytes_read")
-				.with_description("Number of bytes read from disk")
-				.init()
-				.bind(&[]),
-			block_read_duration: meter
-				.f64_value_recorder("block.read_duration")
-				.with_description("Duration of block read operations")
-				.init()
-				.bind(&[]),
-			bytes_written: meter
-				.u64_counter("block.bytes_written")
-				.with_description("Number of bytes written to disk")
-				.init()
-				.bind(&[]),
-			block_write_duration: meter
-				.f64_value_recorder("block.write_duration")
-				.with_description("Duration of block write operations")
-				.init()
-				.bind(&[]),
-			delete_counter: meter
-				.u64_counter("block.delete_counter")
-				.with_description("Number of blocks deleted")
-				.init()
-				.bind(&[]),
-
-			corruption_counter: meter
-				.u64_counter("block.corruption_counter")
-				.with_description("Data corruptions detected on block reads")
-				.init()
-				.bind(&[]),
-		}
-	}
-}

src/model/block_ref_table.rs

@@ -6,7 +6,7 @@ use garage_util::data::*;
 use garage_table::crdt::Crdt;
 use garage_table::*;
 
-use crate::block::*;
+use garage_block::manager::*;
 
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct BlockRef {

src/model/garage.rs

@@ -11,8 +11,8 @@ use garage_table::replication::ReplicationMode;
 use garage_table::replication::TableFullReplication;
 use garage_table::replication::TableShardedReplication;
 use garage_table::*;
+use garage_block::manager::*;
 
-use crate::block::*;
 use crate::block_ref_table::*;
 use crate::bucket_alias_table::*;
 use crate::bucket_table::*;
@@ -87,7 +87,10 @@ impl Garage {
 
 		info!("Initialize block manager...");
 		let block_manager =
-			BlockManager::new(&db, config.data_dir.clone(), data_rep_param, system.clone());
+			BlockManager::new(&db,
+							  config.data_dir.clone(),
+							  config.compression_level,
+							  data_rep_param, system.clone());
 
 		info!("Initialize block_ref_table...");
 		let block_ref_table = Table::new(
@@ -151,17 +154,11 @@ impl Garage {
 		});
 
 		info!("Start block manager background thread...");
-		garage.block_manager.garage.swap(Some(garage.clone()));
 		garage.block_manager.clone().spawn_background_worker();
 
 		garage
 	}
 
-	/// Use this for shutdown
-	pub fn break_reference_cycles(&self) {
-		self.block_manager.garage.swap(None);
-	}
-
 	pub fn bucket_helper(&self) -> helper::bucket::BucketHelper {
 		helper::bucket::BucketHelper(self)
 	}

src/model/lib.rs

@@ -10,9 +10,6 @@ pub mod key_table;
 pub mod object_table;
 pub mod version_table;
 
-pub mod block;
-mod block_metrics;
-
 pub mod garage;
 pub mod helper;
 pub mod migrate;