Merge pull request #3 from silentred/bugfix

bugfix: If a local volume is SpdkLVol type, connect the target
eosphoros-ai · Nov 29, 2023 · 3b75579 · 3b75579
2 parents 290e8b6 + c49865b
commit 3b75579
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/hack/deploy/base/500-disk-operator.yaml b/hack/deploy/base/500-disk-operator.yaml
@@ -48,7 +48,7 @@ spec:
           secretName: selfsigned-cert-tls
       containers:
       - name: node-disk-controller
-        image: silentred/node-disk-controller:7184e038-20231129171234
+        image: silentred/node-disk-controller:ba03b9e2-20231129185104
         command:
         - /node-disk-controller
         args:

diff --git a/hack/deploy/base/600-csi-controller.yaml b/hack/deploy/base/600-csi-controller.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccount: obnvmf-admin
       containers:
       - name: csi-antstor
-        image: silentred/node-disk-controller:7184e038-20231129171234
+        image: silentred/node-disk-controller:ba03b9e2-20231129185104
         command:
         - /node-disk-controller
         args:

diff --git a/hack/deploy/base/700-disk-agent.yaml b/hack/deploy/base/700-disk-agent.yaml
@@ -26,7 +26,7 @@ spec:
             capabilities:
               add: ["ALL"]
             allowPrivilegeEscalation: true
-          image: silentred/node-disk-controller:7184e038-20231129171234
+          image: silentred/node-disk-controller:ba03b9e2-20231129185104
           #imagePullPolicy: Always
           command:
             - /node-disk-controller

diff --git a/hack/deploy/base/800-csi-node.yaml b/hack/deploy/base/800-csi-node.yaml
@@ -26,7 +26,7 @@ spec:
             capabilities:
               add: ["CAP_MKNOD", "CAP_SYS_ADMIN", "SYS_ADMIN", "SYS_RAWIO"]
             allowPrivilegeEscalation: true
-          image: silentred/node-disk-controller:7184e038-20231129171234
+          image: silentred/node-disk-controller:ba03b9e2-20231129185104
           command:
           - /node-disk-controller
           args:

diff --git a/pkg/csi/rpcserver/node.go b/pkg/csi/rpcserver/node.go
@@ -175,11 +175,12 @@ func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol
 		return &csi.NodeStageVolumeResponse{}, nil
 	}
 
-	// runc 的逻辑
-	// 1. 如果是本地磁盘，跳过 nvme client connect的步骤，直接使用 DevPath 去 format and Mount
-	// 2. 如果是远程磁盘，则先 nvme client connect;
+	// for runc:
+	// 1. For local volume, skip doing `nvme connect`, use DevPath for formating and mounting.
+	// 2. For remote volume, do `nvme connect`, get the connected DevPath.
+	// 3. if the volume is local and type is SpdkLVol, do the same as remote volume.
 	devicePath = pv.GetDevPath()
-	if !isLocalDisk {
+	if !isLocalDisk || (!isLVM && pv.GetSpdkTarget() != nil) {
 		devicePath, err = connectSpdkTarget(pv.GetSpdkTarget())
 		if err != nil {
 			klog.Error(err)