public_git
/
democratic-csi
mirror of https://github.com/democratic-csi/democratic-csi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more robust lun id logic 

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen 2021-06-25 00:33:27 -06:00
parent 49c0c9b16c
commit 86f7d16aa3
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/driver/controller-synology/index.js
View File

@ -271,6 +271,9 @@ class ControllerSynologyDriver extends CsiBaseDriver {
case "iscsi":
let iscsiName = driver.buildIscsiName(name);
let data;
let target;
let lun_mapping;
let iqn = driver.options.iscsi.baseiqn + iscsiName;
data = Object.assign(driver.options.iscsi.targetAttributes, {
name: iscsiName,
@ -284,7 +287,7 @@ class ControllerSynologyDriver extends CsiBaseDriver {
size: capacity_bytes,
});
let lun_uuid = await httpClient.CreateLun(data);
let target = await httpClient.GetTargetByTargetID(target_id);
target = await httpClient.GetTargetByTargetID(target_id);
if (!target) {
throw new GrpcError(
@ -293,11 +296,11 @@ class ControllerSynologyDriver extends CsiBaseDriver {
);
}
if (
!target.mapped_luns.some((lun) => {
return lun.lun_uuid == lun_uuid;
})
) {
lun_mapping = target.mapped_luns.find((lun) => {
return lun.lun_uuid == lun_uuid;
});
if (!lun_mapping) {
data = {
uuid: lun_uuid,
target_ids: [target_id],
@ -309,6 +312,19 @@ class ControllerSynologyDriver extends CsiBaseDriver {
};
*/
await httpClient.MapLun(data);
// re-retrieve target to ensure proper lun (mapping_index) value is returned
target = await httpClient.GetTargetByTargetID(target_id);
lun_mapping = target.mapped_luns.find((lun) => {
return lun.lun_uuid == lun_uuid;
});
}
if (!lun_mapping) {
throw new GrpcError(
grpc.status.UNKNOWN,
`failed to lookup lun_mapping_id`
);
}
volume_context = {
@ -319,7 +335,7 @@ class ControllerSynologyDriver extends CsiBaseDriver {
: "",
interface: driver.options.iscsi.interface || "",
iqn,
lun: 0,
lun: lun_mapping.mapping_index,
};
break;
default: