From 3d6c26a2511940c2da102007707b420ccd1b5f30 Mon Sep 17 00:00:00 2001
From: Travis Glenn Hansen <travisghansen@yahoo.com>
Date: Fri, 6 May 2022 20:37:04 -0600
Subject: [PATCH] more minor fixes

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
---
 src/driver/controller-zfs/index.js |  4 ++--
 src/driver/index.js                | 12 ++++++------
 src/utils/filesystem.js            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/driver/controller-zfs/index.js b/src/driver/controller-zfs/index.js
index d88d150..6adfa90 100644
--- a/src/driver/controller-zfs/index.js
+++ b/src/driver/controller-zfs/index.js
@@ -1318,8 +1318,8 @@ class ControllerZfsBaseDriver extends CsiBaseDriver {
     // NOTE: -R will recursively delete items + dependent filesets
     // delete dataset
     try {
-      let max_tries = 5;
-      let sleep_time = 3000;
+      let max_tries = 12;
+      let sleep_time = 5000;
       let current_try = 1;
       let success = false;
       while (!success && current_try <= max_tries) {
diff --git a/src/driver/index.js b/src/driver/index.js
index 23b30fd..8225ecf 100644
--- a/src/driver/index.js
+++ b/src/driver/index.js
@@ -1261,8 +1261,7 @@ class CsiBaseDriver {
             result = await filesystem.pathExists(win_staging_target_path);
 
             if (result) {
-              result = fs.lstatSync(win_staging_target_path);
-              if (!result.isSymbolicLink()) {
+              if (!(await filesystem.isSymbolicLink(win_staging_target_path))) {
                 fs.rmdirSync(win_staging_target_path);
               } else {
                 result = await wutils.GetItem(win_staging_target_path);
@@ -1310,8 +1309,9 @@ class CsiBaseDriver {
               if (!details.includes("ResourceExists")) {
                 throw e;
               } else {
-                result = fs.lstatSync(win_staging_target_path);
-                if (!result.isSymbolicLink()) {
+                if (
+                  !(await filesystem.isSymbolicLink(win_staging_target_path))
+                ) {
                   throw new Error("staging path exists but is not symlink");
                 }
               }
@@ -3215,7 +3215,7 @@ class CsiBaseDriver {
           filesystem.covertUnixSeparatorToWindowsSeparator(volume_path);
 
         // ensure path is mounted
-        result = filesystem.pathExists(win_volume_path);
+        result = await filesystem.pathExists(win_volume_path);
         if (!result) {
           throw new GrpcError(
             grpc.status.NOT_FOUND,
@@ -3223,7 +3223,7 @@ class CsiBaseDriver {
           );
         }
 
-        let target = await wutils.GetRealTarget(win_volume_path);
+        let target = (await wutils.GetRealTarget(win_volume_path)) || "";
         if (target.startsWith("\\\\")) {
           node_attach_driver = "smb";
         }
diff --git a/src/utils/filesystem.js b/src/utils/filesystem.js
index de4bce7..e4f90c2 100644
--- a/src/utils/filesystem.js
+++ b/src/utils/filesystem.js
@@ -228,7 +228,7 @@ class Filesystem {
     }
   }
 
-  async isSymboliclink(path) {
+  async isSymbolicLink(path) {
     return fs.lstatSync(path).isSymbolicLink();
   }