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

Merge 10aa9c539a into 55c36d62ff

This commit is contained in:
Jon Fuller 2025-08-06 22:11:40 +00:00 committed by GitHub
parent 55c36d62ff 10aa9c539a
commit f17cfd9bde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 118 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/driver/freenas/api.js
View File

@ -150,6 +150,48 @@ class FreeNASApiDriver extends CsiBaseDriver {
}
}
/**
* Check if an error response indicates a target already exists.
* This method handles variations in TrueNAS API error messages across different API versions.
*
* @param {string|Object} responseBody - The HTTP response body (string or object)
* @returns {boolean} - true if the error indicates target already exists
*/
isTargetAlreadyExistsError(responseBody) {
// Extract error message more efficiently
let errorString = '';
if (typeof responseBody === 'string') {
errorString = responseBody;
} else if (responseBody && typeof responseBody === 'object') {
// Try common error message fields first to avoid full JSON.stringify
errorString = responseBody.message ||
responseBody.error ||
responseBody.detail ||
JSON.stringify(responseBody);
} else {
return false;
}
// Handle multiple variations of the target already exists error message
const targetExistsPatterns = [
"Target name already exists", // Original pattern in code (API v1)
"Target with this name already exists", // Actual TrueNAS error message (API v2)
"Target\\b.*\\balready\\b.*\\bexists" // Flexible pattern with word boundaries
];
return targetExistsPatterns.some(pattern => {
if (pattern.includes("\\")) {
// Use regex for flexible patterns with word boundaries
const regex = new RegExp(pattern, "i");
return regex.test(errorString);
} else {
// Use case-insensitive simple string matching for exact patterns
return errorString.toLowerCase().includes(pattern.toLowerCase());
}
});
}
/**
* only here for the helpers
* @returns
@ -835,14 +877,12 @@ class FreeNASApiDriver extends CsiBaseDriver {
target
);
// 409 if invalid
// 409 Conflict - target already exists or other validation errors
if (response.statusCode != 201) {
target = null;
if (
response.statusCode == 409 &&
JSON.stringify(response.body).includes(
"Target name already exists"
)
this.isTargetAlreadyExistsError(response.body)
) {
target = await httpApiClient.findResourceByProperties(
"/services/iscsi/target",
@ -1123,14 +1163,12 @@ class FreeNASApiDriver extends CsiBaseDriver {
response = await httpClient.post("/iscsi/target", target);
// 409 if invalid
// 422 Unprocessable Entity - validation errors including duplicate targets
if (response.statusCode != 200) {
target = null;
if (
response.statusCode == 422 &&
JSON.stringify(response.body).includes(
"Target name already exists"
)
this.isTargetAlreadyExistsError(response.body)
) {
target = await httpApiClient.findResourceByProperties(
"/iscsi/target",

3
src/driver/freenas/http/api.js
View File

@ -66,7 +66,8 @@ class Api {
// crude stoppage attempt
let response = await httpClient.get(endpoint, queryParams);
if (lastReponse) {
if (JSON.stringify(lastReponse) == JSON.stringify(response)) {
// Compare only the response body to avoid circular reference issues
if (JSON.stringify(lastReponse.body) == JSON.stringify(response.body)) {
break;
}
}

79
src/driver/freenas/ssh.js
View File

@ -176,6 +176,48 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
}
}
/**
* Check if an error response indicates a target already exists.
* This method handles variations in TrueNAS API error messages across different API versions.
*
* @param {string|Object} responseBody - The HTTP response body (string or object)
* @returns {boolean} - true if the error indicates target already exists
*/
isTargetAlreadyExistsError(responseBody) {
// Extract error message more efficiently
let errorString = '';
if (typeof responseBody === 'string') {
errorString = responseBody;
} else if (responseBody && typeof responseBody === 'object') {
// Try common error message fields first to avoid full JSON.stringify
errorString = responseBody.message ||
responseBody.error ||
responseBody.detail ||
JSON.stringify(responseBody);
} else {
return false;
}
// Handle multiple variations of the target already exists error message
const targetExistsPatterns = [
"Target name already exists", // Original pattern in code (API v1)
"Target with this name already exists", // Actual TrueNAS error message (API v2)
"Target\\b.*\\balready\\b.*\\bexists" // Flexible pattern with word boundaries
];
return targetExistsPatterns.some(pattern => {
if (pattern.includes("\\")) {
// Use regex for flexible patterns with word boundaries
const regex = new RegExp(pattern, "i");
return regex.test(errorString);
} else {
// Use case-insensitive simple string matching for exact patterns
return errorString.toLowerCase().includes(pattern.toLowerCase());
}
});
}
async findResourceByProperties(endpoint, match) {
if (!match) {
return;
@ -210,7 +252,8 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
// crude stoppage attempt
let response = await httpClient.get(endpoint, queryParams);
if (lastReponse) {
if (JSON.stringify(lastReponse) == JSON.stringify(response)) {
// Compare only the response body to avoid circular reference issues
if (JSON.stringify(lastReponse.body) == JSON.stringify(response.body)) {
break;
}
}
@ -924,21 +967,30 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
target
);
// 409 if invalid
// 409 Conflict - target already exists or other validation errors
if (response.statusCode != 201) {
target = null;
if (
response.statusCode == 409 &&
JSON.stringify(response.body).includes(
"Target name already exists"
)
this.isTargetAlreadyExistsError(response.body)
) {
this.ctx.logger.debug(
"iSCSI target already exists, attempting to find existing target with name: %s",
iscsiName
);
target = await this.findResourceByProperties(
"/services/iscsi/target",
{
iscsi_target_name: iscsiName,
}
);
if (target) {
this.ctx.logger.debug(
"Found existing iSCSI target with ID: %s, name: %s",
target.id,
target.iscsi_target_name
);
}
} else {
throw new GrpcError(
grpc.status.UNKNOWN,
@ -1212,21 +1264,30 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
response = await httpClient.post("/iscsi/target", target);
// 409 if invalid
// 422 Unprocessable Entity - validation errors including duplicate targets
if (response.statusCode != 200) {
target = null;
if (
response.statusCode == 422 &&
JSON.stringify(response.body).includes(
"Target name already exists"
)
this.isTargetAlreadyExistsError(response.body)
) {
this.ctx.logger.debug(
"iSCSI target already exists, attempting to find existing target with name: %s",
iscsiName
);
target = await this.findResourceByProperties(
"/iscsi/target",
{
name: iscsiName,
}
);
if (target) {
this.ctx.logger.debug(
"Found existing iSCSI target with ID: %s, name: %s",
target.id,
target.name
);
}
} else {
throw new GrpcError(
grpc.status.UNKNOWN,