Merge pull request #13 from joy717/master

archlitchi · web-flow · commit 12bb96d41260 · 2025-03-20T12:22:45.000+08:00
[FIX]rollback vdev config for container
diff --git a/internal/pkg/dcu/server.go b/internal/pkg/dcu/server.go
@@ -381,7 +381,7 @@ func (p *Plugin) createvdevFiles(current *corev1.Pod, ctr *corev1.Container, req
 	}
 	dirName := string(current.UID) + "_" + ctr.Name + "_" + fmt.Sprint(devidx) + "_" + fmt.Sprint(pipeid) + "_" + fmt.Sprint(vdevidx) + "_" + fmt.Sprint(coremsk1) + "_" + fmt.Sprint(coremsk2)
 	cacheFileHostDirectory := fmt.Sprintf("/usr/local/vgpu/dcu/%s", dirName)
-	err = createvdevFile(pcibusId, coremsk1, coremsk2, reqcores, mem, devidx, vdevidx, pipeid, cacheFileHostDirectory, fmt.Sprintf("vdev%d.conf", vdevidx))
+	err = createvdevFile(pcibusId, coremsk1, coremsk2, reqcores, mem, 0, vdevidx, pipeid, cacheFileHostDirectory, "vdev0.conf")
 	if err != nil {
 		return "", err
 	}

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ func (p Plugin) createvdevFiles(current corev1.Pod, ctr *corev1.Container, req`
`381`	`381`	`}`
`382`	`382`	`dirName := string(current.UID) + "_" + ctr.Name + "_" + fmt.Sprint(devidx) + "_" + fmt.Sprint(pipeid) + "_" + fmt.Sprint(vdevidx) + "_" + fmt.Sprint(coremsk1) + "_" + fmt.Sprint(coremsk2)`
`383`	`383`	`cacheFileHostDirectory := fmt.Sprintf("/usr/local/vgpu/dcu/%s", dirName)`
`384`		`- err = createvdevFile(pcibusId, coremsk1, coremsk2, reqcores, mem, devidx, vdevidx, pipeid, cacheFileHostDirectory, fmt.Sprintf("vdev%d.conf", vdevidx))`
	`384`	`+ err = createvdevFile(pcibusId, coremsk1, coremsk2, reqcores, mem, 0, vdevidx, pipeid, cacheFileHostDirectory, "vdev0.conf")`
`385`	`385`	`if err != nil {`
`386`	`386`	`return "", err`
`387`	`387`	`}`