[support bundle] Refactor into tasks #9253
Conversation
| } | ||
|
|
||
| type CollectionStepFn = Box< | ||
| dyn for<'b> FnOnce( |
There was a problem hiding this comment.
This signature looks a little nasty, but it's basically just saying:
- Every "step" acts on a BundleCollection,
- ... has an output directory
- ... and can emit a CollectionStepOutput object (which either updates the report, or makes more steps)
| let mut tasks = | ||
| ParallelTaskSet::new_with_parallelism(MAX_CONCURRENT_STEPS); |
There was a problem hiding this comment.
Previously, we had some ParallelTaskSets embedded within the collection of sub-pieces of the bundle.
This new "step-based" infrastructure shares that more broadly - everything should be using this one ParallelTaskSet (which is good? that prevents a task that spawns a bunch of other task set, that spawns more task sets - everything is just a unit of work that can get added to this one set).
|
|
||
| let ereport_collection = if let Some(ref ereport_filters) = | ||
| self.request.ereport_query | ||
| async fn collect_host_ereports( |
There was a problem hiding this comment.
The prior mechanism of collecting ereports from {host, sp} did a bit of manual task management, and stored atomics within the bundle itself.
I've just made each part of the ereport collection a distinct step: no more atomics, no more manual tokio tasks - each one is just "one step" with output.
| async fn get_or_initialize_mgs_client<'a>( | ||
| &self, | ||
| mgs_client: &'a OnceCell<Arc<Option<MgsClient>>>, | ||
| ) -> &'a Arc<Option<MgsClient>> { | ||
| mgs_client | ||
| .get_or_init(|| async { | ||
| Arc::new(self.create_mgs_client().await.ok()) | ||
| }) | ||
| .await | ||
| } | ||
|
|
||
| const MAX_CONCURRENT_SLED_REQUESTS: usize = 16; | ||
| const FAILURE_MESSAGE: &str = | ||
| "Failed to fully collect support bundle info from sled"; | ||
| let mut set = ParallelTaskSet::new_with_parallelism( | ||
| MAX_CONCURRENT_SLED_REQUESTS, | ||
| async fn get_or_initialize_all_sleds<'a>( | ||
| &self, | ||
| all_sleds: &'a OnceCell<Arc<Option<Vec<Sled>>>>, | ||
| ) -> &'a Arc<Option<Vec<Sled>>> { | ||
| all_sleds | ||
| .get_or_init(|| async { | ||
| Arc::new( | ||
| self.datastore | ||
| .sled_list_all_batched( | ||
| &self.opctx, | ||
| SledFilter::InService, | ||
| ) | ||
| .await | ||
| .ok(), | ||
| ) | ||
| }) | ||
| .await |
There was a problem hiding this comment.
I'm using lazily-initialized variables for "data/clients that might get created as a part of bundle collection, but might not".
This becomes more relevant with #9254, when we may or may not need these values to get initialized at all.
|
|
||
| let mut extra_steps: Vec<(&'static str, CollectionStepFn)> = vec![]; | ||
| for sp in get_available_sps(&mgs_client).await? { | ||
| extra_steps.push(( |
There was a problem hiding this comment.
Rather than collecting all SP reports via new tokio tasks, these are creating new "steps" that get kicked back to the top-level ParallelTaskSet I mentioned earlier.
1 participant
Re-structures support bundle collection into tasks.
This centralizes step dispatching, and makes it slightly more clear that tasks are independent (where they can be).