Check for empty output of vitastor-nbd map (just in case)

csi/src/controllerserver.go

@@ -97,6 +97,15 @@ func GetConnectionParams(params map[string]string) (map[string]string, error)
         }
     case []string:
         etcdUrl = config["etcd_address"].([]string)
+    case []interface{}:
+        for _, url := range config["etcd_address"].([]interface{})
+        {
+            s, ok := url.(string)
+            if (ok)
+            {
+                etcdUrl = append(etcdUrl, s)
+            }
+        }
     }
     if (len(etcdUrl) == 0)
     {
@@ -105,8 +114,9 @@ func GetConnectionParams(params map[string]string) (map[string]string, error)
     return ctxVars, nil
 }
 
-func system(program string, args ...string) ([]byte, error)
+func system(program string, args ...string) ([]byte, []byte, error)
 {
+    klog.Infof("Running "+program+" "+strings.Join(args, " "))
     c := exec.Command(program, args...)
     var stdout, stderr bytes.Buffer
     c.Stdout, c.Stderr = &stdout, &stderr
@@ -115,9 +125,9 @@ func system(program string, args ...string) ([]byte, error)
     {
         stdoutStr, stderrStr := string(stdout.Bytes()), string(stderr.Bytes())
         klog.Errorf(program+" "+strings.Join(args, " ")+" failed: %s, status %s\n", stdoutStr+stderrStr, err)
-        return nil, status.Error(codes.Internal, stdoutStr+stderrStr+" (status "+err.Error()+")")
+        return nil, nil, status.Error(codes.Internal, stdoutStr+stderrStr+" (status "+err.Error()+")")
     }
-    return stdout.Bytes(), nil
+    return stdout.Bytes(), stderr.Bytes(), nil
 }
 
 func invokeCLI(ctxVars map[string]string, args []string) ([]byte, error)
@@ -126,7 +136,8 @@ func invokeCLI(ctxVars map[string]string, args []string) ([]byte, error)
     {
         args = append(args, "--config_path", ctxVars["configPath"])
     }
-    return system("/usr/bin/vitastor-cli", args...)
+    stdout, _, err := system("/usr/bin/vitastor-cli", args...)
+    return stdout, err
 }
 
 // Create the volume

csi/src/nodeserver.go

@@ -7,6 +7,7 @@ import (
     "context"
     "errors"
     "encoding/json"
+    "fmt"
     "os"
     "os/exec"
     "path/filepath"
@@ -154,8 +155,13 @@ func (ns *NodeServer) mapNbd(volName string, ctxVars map[string]string, readonly
     {
         args = append(args, "--readonly", "1")
     }
-    dev, err := system("/usr/bin/vitastor-nbd", args...)
-    return strings.TrimSpace(string(dev)), err
+    stdout, stderr, err := system("/usr/bin/vitastor-nbd", args...)
+    dev := strings.TrimSpace(string(stdout))
+    if (dev == "")
+    {
+        return "", fmt.Errorf("vitastor-nbd did not return the name of NBD device. output: %s", stderr)
+    }
+    return dev, err
 }
 
 func (ns *NodeServer) unmapNbd(devicePath string)
@@ -221,7 +227,7 @@ func startStorageDaemon(vdpaId, volName, pidFile, configPath string, readonly bo
     {
         writable = "false"
     }
-    _, err := system(
+    _, _, err := system(
         "/usr/bin/qemu-storage-daemon", "--daemonize", "--pidfile", pidFile, "--blockdev", string(blockSpecJson),
         "--export", "vduse-blk,id="+vdpaId+",node-name=disk1,name="+vdpaId+",num-queues=16,queue-size=128,writable="+writable,
     )
@@ -234,7 +240,7 @@ func (ns *NodeServer) mapVduse(volName string, ctxVars map[string]string, readon
     stateFd, err := os.CreateTemp(ns.stateDir, "vitastor-vduse-*.json")
     if (err != nil)
     {
-        return "", "", status.Error(codes.Internal, err.Error())
+        return "", "", err
     }
     stateFile := stateFd.Name()
     stateFd.Close()
@@ -246,7 +252,7 @@ func (ns *NodeServer) mapVduse(volName string, ctxVars map[string]string, readon
     if (err == nil)
     {
         // Add device to VDPA bus
-        _, err = system("/sbin/vdpa", "-j", "dev", "add", "name", vdpaId, "mgmtdev", "vduse")
+        _, _, err = system("/sbin/vdpa", "-j", "dev", "add", "name", vdpaId, "mgmtdev", "vduse")
         if (err == nil)
         {
             // Find block device name
@@ -277,13 +283,7 @@ func (ns *NodeServer) mapVduse(volName string, ctxVars map[string]string, readon
                     }
                 }
             }
-            if (err != nil)
-            {
-                err = status.Error(codes.Internal, err.Error())
         }
-        }
-        if (err != nil)
-        {
         killErr := killByPidFile(pidFile)
         if (killErr != nil)
         {
@@ -292,7 +292,6 @@ func (ns *NodeServer) mapVduse(volName string, ctxVars map[string]string, readon
         os.Remove(stateFile)
         os.Remove(pidFile)
     }
-    }
     return "", "", err
 }
 
@@ -337,7 +336,7 @@ func (ns *NodeServer) unmapVduseById(vdpaId string)
     }
     else
     {
-        _, _ = system("/sbin/vdpa", "-j", "dev", "del", vdpaId)
+        _, _, _ = system("/sbin/vdpa", "-j", "dev", "del", vdpaId)
     }
     stateFile := ns.stateDir + vdpaId + ".json"
     os.Remove(stateFile)
@@ -377,7 +376,7 @@ func (ns *NodeServer) restoreVduseDaemons()
     }
     devList := make(map[string]interface{})
     // example output: {"dev":{"test1":{"type":"block","mgmtdev":"vduse","vendor_id":0,"max_vqs":16,"max_vq_size":128}}}
-    devListJSON, err := system("/sbin/vdpa", "-j", "dev", "list")
+    devListJSON, _, err := system("/sbin/vdpa", "-j", "dev", "list")
     if (err != nil)
     {
         return
@@ -456,13 +455,13 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
                 if (err != nil)
                 {
                     klog.Errorf("failed to create block device mount target %s with error: %v", targetPath, err)
-                    return nil, status.Error(codes.Internal, err.Error())
+                    return nil, err
                 }
                 err = pathFile.Close()
                 if (err != nil)
                 {
                     klog.Errorf("failed to close %s with error: %v", targetPath, err)
-                    return nil, status.Error(codes.Internal, err.Error())
+                    return nil, err
                 }
             }
             else
@@ -471,13 +470,13 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
                 if (err != nil)
                 {
                     klog.Errorf("failed to create fs mount target %s with error: %v", targetPath, err)
-                    return nil, status.Error(codes.Internal, err.Error())
+                    return nil, err
                 }
             }
         }
         else
         {
-            return nil, status.Error(codes.Internal, err.Error())
+            return nil, err
         }
     }
 
@@ -597,7 +596,7 @@ unmap:
     {
         ns.unmapVduseById(vdpaId)
     }
-    return nil, status.Error(codes.Internal, err.Error())
+    return nil, err
 }
 
 // NodeUnpublishVolume unmounts the volume from the target path
@@ -612,7 +611,7 @@ func (ns *NodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu
         {
             return nil, status.Error(codes.NotFound, "Target path not found")
         }
-        return nil, status.Error(codes.Internal, err.Error())
+        return nil, err
     }
     if (devicePath == "")
     {
@@ -625,7 +624,7 @@ func (ns *NodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu
     err = mount.CleanupMountPoint(targetPath, ns.mounter, false)
     if (err != nil)
     {
-        return nil, status.Error(codes.Internal, err.Error())
+        return nil, err
     }
     // unmap NBD device
     if (refCount == 1)