Skip to content

Commit 144e0d4

Browse files
committed
chore: address review comments
Signed-off-by: Diwakar Sharma <diwakar.sharma@datacore.com>
1 parent f4ee295 commit 144e0d4

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

io-engine/src/lvs/lvs_error.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ pub enum BsError {
4949
OutOfMetadata {},
5050
#[snafu(display(": capacity overflow"))]
5151
CapacityOverflow {},
52-
#[snafu(display(": crypto vbdev error"))]
53-
LvsCryptoVbdev {},
52+
#[snafu(display(": crypto vbdev error. {source:?}"))]
53+
LvsCryptoVbdev { source: Errno },
5454
}
5555

5656
impl BsError {
@@ -103,7 +103,7 @@ impl ToErrno for BsError {
103103
Self::NoSpace {} => Errno::ENOSPC,
104104
Self::OutOfMetadata {} => Errno::EMFILE,
105105
Self::CapacityOverflow {} => Errno::EOVERFLOW,
106-
Self::LvsCryptoVbdev {} => Errno::EINVAL,
106+
Self::LvsCryptoVbdev { source } => source,
107107
}
108108
}
109109
}

io-engine/src/lvs/lvs_store.rs

+18-8
Original file line numberDiff line numberDiff line change
@@ -364,14 +364,19 @@ impl Lvs {
364364
if let Some(e) = args.enc_key {
365365
match create_crypto_vbdev_on_base_bdev(cname, &bdev, &e) {
366366
Ok(_) => {}
367-
Err(_) => {
368-
let _ = parsed.destroy().await.map_err(|_e| {
367+
Err(berr) => {
368+
let _ = parsed.destroy().await.map_err(|e| {
369369
error!(
370-
"failed to delete base_bdev {bdev} after failed crypto vbdev creation"
370+
"failed to delete base_bdev {bdev} after failed crypto vbdev creation. {e:?}"
371371
);
372372
});
373373
return Err(LvsError::PoolCreate {
374-
source: BsError::LvsCryptoVbdev {},
374+
source: BsError::LvsCryptoVbdev {
375+
source: match berr {
376+
BdevError::CreateBdevFailed { source, .. } => source,
377+
_ => Errno::EINVAL,
378+
},
379+
},
375380
name: args.name.clone(),
376381
});
377382
}
@@ -588,14 +593,19 @@ impl Lvs {
588593
if let Some(ref e) = args.enc_key {
589594
match create_crypto_vbdev_on_base_bdev(cname, &bdev_name, e) {
590595
Ok(_) => {}
591-
Err(_) => {
592-
let _ = bdev_ops.destroy().await.map_err(|_e| {
596+
Err(berr) => {
597+
let _ = bdev_ops.destroy().await.map_err(|e| {
593598
error!(
594-
"failed to delete base_bdev {bdev_name} after failed crypto vbdev creation"
599+
"failed to delete base_bdev {bdev_name} after failed crypto vbdev creation. {e:?}"
595600
);
596601
});
597602
return Err(LvsError::PoolCreate {
598-
source: BsError::LvsCryptoVbdev {},
603+
source: BsError::LvsCryptoVbdev {
604+
source: match berr {
605+
BdevError::CreateBdevFailed { source, .. } => source,
606+
_ => Errno::EINVAL,
607+
},
608+
},
599609
name: args.name.clone(),
600610
});
601611
}

0 commit comments

Comments
 (0)