-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1581: Rebuild refactoring r=tiagolobocastro a=tiagolobocastro
refactor(rebuild): make the rebuild more generic
A rebuild is essentially a copy from one bdev to another.
However, we can have different variations on this.
This change aims to make the rebuild more generic, removing the nexus specific
bits from the core rebuild logic and allowing us to compose different types of
rebuild in the future, whilst being able to reuse the shared bits.
To achieve this the rebuild backend is split into a rebuild manager which is the
generic component responsible for running and managing the rebuild and its tasks.
We can then implement different rebuild backends as we see fit, example a nexus
rebuild which locks ranges or a regular bdev to bdev rebuild.
Signed-off-by: Tiago Castro <[email protected]>
---
fix(rebuild): send final rebuild state on drop
Signed-off-by: Tiago Castro <[email protected]>
Co-authored-by: Tiago Castro <[email protected]>- Loading branch information
Showing
18 changed files
with
1,064 additions
and
603 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| use std::{ | ||
| ops::{Deref, Range}, | ||
| rc::Rc, | ||
| }; | ||
|
|
||
| use super::{ | ||
| rebuild_descriptor::RebuildDescriptor, | ||
| rebuild_error::RebuildError, | ||
| rebuild_job_backend::RebuildBackend, | ||
| rebuild_task::{RebuildTasks, TaskResult}, | ||
| RebuildJob, | ||
| RebuildJobOptions, | ||
| SEGMENT_TASKS, | ||
| }; | ||
|
|
||
| use crate::gen_rebuild_instances; | ||
|
|
||
| /// A Bdev rebuild job is responsible for managing a rebuild (copy) which reads | ||
| /// from source_hdl and writes into destination_hdl from specified start to end. | ||
| pub struct BdevRebuildJob(RebuildJob); | ||
|
|
||
| impl std::fmt::Debug for BdevRebuildJob { | ||
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
| self.0.fmt(f) | ||
| } | ||
| } | ||
| impl Deref for BdevRebuildJob { | ||
| type Target = RebuildJob; | ||
|
|
||
| fn deref(&self) -> &Self::Target { | ||
| &self.0 | ||
| } | ||
| } | ||
|
|
||
| impl BdevRebuildJob { | ||
| /// Creates a new RebuildJob which rebuilds from source URI to target URI | ||
| /// from start to end (of the data partition); notify_fn callback is called | ||
| /// when the rebuild state is updated - with the source and destination | ||
| /// bdev URI's as arguments. | ||
| pub async fn new( | ||
| src_uri: &str, | ||
| dst_uri: &str, | ||
| range: Option<Range<u64>>, | ||
| options: RebuildJobOptions, | ||
| notify_fn: fn(&str, &str) -> (), | ||
| ) -> Result<Self, RebuildError> { | ||
| let descriptor = | ||
| RebuildDescriptor::new(src_uri, dst_uri, range, options).await?; | ||
| let tasks = RebuildTasks::new(SEGMENT_TASKS, &descriptor)?; | ||
| let backend = | ||
| BdevRebuildJobBackend::new(tasks, notify_fn, descriptor).await?; | ||
|
|
||
| RebuildJob::from_backend(backend).await.map(Self) | ||
| } | ||
| } | ||
|
|
||
| gen_rebuild_instances!(BdevRebuildJob); | ||
|
|
||
| /// A rebuild job which is responsible for rebuilding from | ||
| /// source to target of the `RebuildDescriptor`. | ||
| pub(super) struct BdevRebuildJobBackend { | ||
| /// The next block to be rebuilt. | ||
| next: u64, | ||
| /// A pool of tasks which perform the actual data rebuild. | ||
| task_pool: RebuildTasks, | ||
| /// A generic rebuild descriptor. | ||
| descriptor: Rc<RebuildDescriptor>, | ||
| /// Notification callback with src and dst uri's. | ||
| notify_fn: fn(&str, &str) -> (), | ||
| } | ||
|
|
||
| #[async_trait::async_trait(?Send)] | ||
| impl RebuildBackend for BdevRebuildJobBackend { | ||
| fn on_state_change(&mut self) { | ||
| (self.notify_fn)(&self.descriptor.src_uri, &self.descriptor.dst_uri); | ||
| } | ||
|
|
||
| fn common_desc(&self) -> &RebuildDescriptor { | ||
| &self.descriptor | ||
| } | ||
|
|
||
| fn task_pool(&self) -> &RebuildTasks { | ||
| &self.task_pool | ||
| } | ||
|
|
||
| fn schedule_task_by_id(&mut self, id: usize) -> bool { | ||
| if self.next >= self.descriptor.range.end { | ||
| false | ||
| } else { | ||
| let next = std::cmp::min( | ||
| self.next + self.descriptor.segment_size_blks, | ||
| self.descriptor.range.end, | ||
| ); | ||
| self.task_pool.schedule_segment_rebuild( | ||
| id, | ||
| self.next, | ||
| self.descriptor.clone(), | ||
| ); | ||
| self.task_pool.active += 1; | ||
| self.next = next; | ||
| true | ||
| } | ||
| } | ||
|
|
||
| async fn await_one_task(&mut self) -> Option<TaskResult> { | ||
| self.task_pool.await_one_task().await | ||
| } | ||
| } | ||
|
|
||
| impl std::fmt::Debug for BdevRebuildJobBackend { | ||
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
| f.debug_struct("BdevRebuildJob") | ||
| .field("next", &self.next) | ||
| .finish() | ||
| } | ||
| } | ||
| impl std::fmt::Display for BdevRebuildJobBackend { | ||
| fn fmt(&self, _f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| impl BdevRebuildJobBackend { | ||
| /// Creates a new RebuildJob which rebuilds from source URI to target URI | ||
| /// from start to end (of the data partition); notify_fn callback is called | ||
| /// when the rebuild state is updated - with the source and destination | ||
| /// URI as arguments. | ||
| pub async fn new( | ||
| task_pool: RebuildTasks, | ||
| notify_fn: fn(&str, &str) -> (), | ||
| descriptor: RebuildDescriptor, | ||
| ) -> Result<Self, RebuildError> { | ||
| let be = Self { | ||
| next: descriptor.range.start, | ||
| task_pool, | ||
| descriptor: Rc::new(descriptor), | ||
| notify_fn, | ||
| }; | ||
|
|
||
| info!("{be}: backend created"); | ||
|
|
||
| Ok(be) | ||
| } | ||
| } |
Oops, something went wrong.