From 888556aa5eee3fd1caa1df2debe9911cde7bff77 Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Sat, 7 May 2022 21:20:24 -0600 Subject: [PATCH] more robust smb delete for freenas Signed-off-by: Travis Glenn Hansen --- src/driver/controller-zfs-generic/index.js | 2 +- src/driver/freenas/api.js | 5 ++++- src/driver/freenas/ssh.js | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/driver/controller-zfs-generic/index.js b/src/driver/controller-zfs-generic/index.js index 4d522b8..6a6c9c7 100644 --- a/src/driver/controller-zfs-generic/index.js +++ b/src/driver/controller-zfs-generic/index.js @@ -520,7 +520,7 @@ delete ${iscsiName} options ); if (response.code != 0) { - throw new Error(JSON.stringify(response)); + throw new Error(response); } driver.ctx.logger.verbose( "TargetCLI response: " + JSON.stringify(response) diff --git a/src/driver/freenas/api.js b/src/driver/freenas/api.js index e082250..9281b2d 100644 --- a/src/driver/freenas/api.js +++ b/src/driver/freenas/api.js @@ -1528,7 +1528,10 @@ class FreeNASApiDriver extends CsiBaseDriver { // returns a 500 if does not exist // v1 = 204 // v2 = 200 - if (![200, 204].includes(response.statusCode)) { + if ( + ![200, 204].includes(response.statusCode) && + !JSON.stringify(response.body).includes("does not exist") + ) { throw new GrpcError( grpc.status.UNKNOWN, `received error deleting smb share - share: ${shareId} code: ${ diff --git a/src/driver/freenas/ssh.js b/src/driver/freenas/ssh.js index 3ca8069..3debb76 100644 --- a/src/driver/freenas/ssh.js +++ b/src/driver/freenas/ssh.js @@ -1577,7 +1577,10 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver { // returns a 500 if does not exist // v1 = 204 // v2 = 200 - if (![200, 204].includes(response.statusCode)) { + if ( + ![200, 204].includes(response.statusCode) && + !JSON.stringify(response.body).includes("does not exist") + ) { throw new GrpcError( grpc.status.UNKNOWN, `received error deleting smb share - share: ${shareId} code: ${