Skip to content
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

Reorder suspend and resume when extending thin devices #3225

Merged
merged 1 commit into from
Jan 12, 2023
Merged

Reorder suspend and resume when extending thin devices #3225

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
39 changes: 23 additions & 16 deletions src/engine/strat_engine/thinpool/thinpool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,8 +884,6 @@ impl ThinPool {
data_existing_segments: &mut Vec<(Sectors, Sectors)>,
data_extend_size: Sectors,
) -> StratisResult<Sectors> {
thinpooldev.suspend(get_dm(), DmOptions::default())?;

info!(
"Attempting to extend thinpool data sub-device belonging to pool {} by {}",
pool_uuid, data_extend_size
Expand All @@ -906,14 +904,19 @@ impl ThinPool {
let data_segments =
data_segment.map(|seg| coalesce_segs(data_existing_segments, &[seg]));
if let Some(mut ds) = data_segments {
thinpooldev.suspend(get_dm(), DmOptions::default())?;
// Leaves data device suspended
thinpooldev.set_data_table(get_dm(), segs_to_table(device, &ds))?;
let res = thinpooldev.set_data_table(get_dm(), segs_to_table(device, &ds));
jbaublitz marked this conversation as resolved.
Show resolved Hide resolved

data_existing_segments.clear();
data_existing_segments.append(&mut ds);
}
if res.is_ok() {
data_existing_segments.clear();
data_existing_segments.append(&mut ds);
}

thinpooldev.resume(get_dm())?;
thinpooldev.resume(get_dm())?;

res?;
}

if let Some(seg) = data_segment {
info!(
Expand Down Expand Up @@ -982,8 +985,6 @@ impl ThinPool {
spare_meta_existing_segments: &mut Vec<(Sectors, Sectors)>,
meta_extend_size: Sectors,
) -> StratisResult<Sectors> {
thinpooldev.suspend(get_dm(), DmOptions::default())?;

info!(
"Attempting to extend thinpool meta sub-device belonging to pool {} by {}",
pool_uuid, meta_extend_size
Expand Down Expand Up @@ -1012,17 +1013,23 @@ impl ThinPool {
});

if let Some((mut ms, mut sms)) = meta_and_spare_segments {
thinpooldev.suspend(get_dm(), DmOptions::default())?;

// Leaves meta device suspended
thinpooldev.set_meta_table(get_dm(), segs_to_table(device, &ms))?;
let res = thinpooldev.set_meta_table(get_dm(), segs_to_table(device, &ms));
jbaublitz marked this conversation as resolved.
Show resolved Hide resolved

meta_existing_segments.clear();
meta_existing_segments.append(&mut ms);
if res.is_ok() {
meta_existing_segments.clear();
meta_existing_segments.append(&mut ms);

spare_meta_existing_segments.clear();
spare_meta_existing_segments.append(&mut sms);
}
spare_meta_existing_segments.clear();
spare_meta_existing_segments.append(&mut sms);
}

thinpooldev.resume(get_dm())?;
thinpooldev.resume(get_dm())?;

res?;
}

if let Some((seg, _)) = meta_and_spare_segment {
info!(
Expand Down