Skip to content

[4/3] Place SP task dumps under sp_task_dumps/ in support bundles #10411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smklein wants to merge 1 commit into
base: omdb-support-bundle-collect
Choose a base branch
from
Open

[4/3] Place SP task dumps under sp_task_dumps/ in support bundles #10411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions dev-tools/omdb/tests/test_all_output.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,15 @@ async fn test_omdb_success_cases() {
});
let mut archive =
zip::ZipArchive::new(zip_file).expect("bundle is a valid zip archive");
for required in
["bundle_id.txt", "meta/reason_for_creation.txt", "meta/trace.json"]
{
for required in [
"bundle_id.txt",
"meta/reason_for_creation.txt",
"meta/trace.json",
"sp_task_dumps/sled_0/dump-0.zip",
"sp_task_dumps/sled_1/dump-0.zip",
"sp_task_dumps/switch_0/dump-0.zip",
"sp_task_dumps/switch_1/dump-0.zip",
] {
assert!(
archive.by_name(required).is_ok(),
"bundle zip is missing expected entry {required}",
Expand Down
14 changes: 7 additions & 7 deletions support-bundle-collection/src/steps/sp_dumps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ pub async fn spawn_collection_steps(

let mut extra_steps: Vec<CollectionStep> = vec![];
for sp in available_sps {
let mgs_client = mgs_client.clone();
let sp_dumps_dir = sp_dumps_dir.clone();
extra_steps.push(CollectionStep::new(
format!("SP dump for {:?}", sp),
Box::new({
let mgs_client = mgs_client.clone();
move |collection, dir| {
async move {
collect_sp_dump(collection, &mgs_client, sp, dir).await
}
.boxed()
Box::new(move |collection, _dir| {
async move {
collect_sp_dump(collection, &mgs_client, sp, &sp_dumps_dir)
.await
}
.boxed()
}),
));
}
Expand Down
Loading