github/csi-driver-nvmf
1
0
Fork 0
mirror of https://github.com/kubernetes-csi/csi-driver-nvmf.git synced 2025-09-09 08:58:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: make example available

Browse Source 
1. fix path error in pkg/nvmf/fabrics.go
2. add nvmf kernel target setup guide
3. update example and deploy yaml

Signed-off-by: Meinhard Zhou <zhouenhua@bytedance.com>
This commit is contained in:
Meinhard Zhou
2022-08-19 18:04:40 +08:00
parent 430f2e209b
commit 411117889a
15 changed files with 288 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/nvmf/fabrics.go
View File

@@ -52,7 +52,7 @@ func getNvmfConnector(nvmfInfo *nvmfDiskInfo) *Connector {
// connector provides a struct to hold all of the needed parameters to make nvmf connection
func _connect(argStr string) error {
file, err := os.OpenFile("/dev/nvmf-fabrics", os.O_RDWR, 0666)
file, err := os.OpenFile("/dev/nvme-fabrics", os.O_RDWR, 0666)
if err != nil {
klog.Errorf("Connect: open NVMf fabrics error: %v", err)
return err
@@ -155,7 +155,7 @@ func (c *Connector) Connect() (string, error) {
}
baseString := fmt.Sprintf("nqn=%s,transport=%s,traddr=%s,trsvcid=%s", c.TargetNqn, c.Transport, c.TargetAddr, c.TargetPort)
devicePath := strings.Join([]string{"/dev/disk/by-id/nvmf-uuid", c.DeviceUUID}, ".")
devicePath := strings.Join([]string{"/dev/disk/by-id/nvme-uuid", c.DeviceUUID}, ".")
// connect to nvmf disk
err := _connect(baseString)
@@ -165,7 +165,7 @@ func (c *Connector) Connect() (string, error) {
klog.Infof("Connect Volume %s success nqn: %s", c.VolumeID, c.TargetNqn)
retries := int(c.RetryCount / c.CheckInterval)
if exists, err := waitForPathToExist(devicePath, retries, int(c.CheckInterval), c.Transport); !exists {
klog.Errorf("connect nqn %s error %v, rollback", c.TargetNqn, err)
klog.Errorf("connect nqn %s error %v, rollback!!!", c.TargetNqn, err)
ret := disconnectByNqn(c.TargetNqn)
if ret < 0 {
klog.Errorf("rollback error !!!")