Skip to content

fix: run chroot by relative path in NVIDIA driver pod #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NekoHK wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −8
Open

fix: run chroot by relative path in NVIDIA driver pod #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions internal/utils/gpus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ import (
var gpusLog = ctrl.Log.WithName("utils_gpus")

const (
nvidiaDriverRoot = "/run/nvidia/driver"
nvidiaDriverRoot = "/run/nvidia/driver"
nvidiaDriverChrootCommand = "chroot"

nvidiaDRADriverName = "dra-driver-nvidia-gpu"
nvidiaDRAKubeletPluginName = nvidiaDRADriverName + "-kubelet-plugin"
Expand Down Expand Up @@ -580,7 +581,7 @@ fi
nvidiaPod,
targetNodeName,
"device_minor,gpu_uuid,pci.bus_id",
"/usr/sbin/chroot",
nvidiaDriverChrootCommand,
nvidiaDriverRoot,
"no GPUs detected via nvidia-driver-daemonset driver root proc scan",
"Successfully got GPU info from nvidia-driver-daemonset driver root",
Expand Down Expand Up @@ -621,7 +622,7 @@ fi
nvidiaPod.Namespace,
nvidiaPod.Name,
nvidiaPod.Spec.Containers[0].Name,
[]string{"/usr/sbin/chroot", nvidiaDriverRoot, "/usr/bin/nvidia-smi", "-i", targetGPUUUID, "-pm", "0"},
[]string{nvidiaDriverChrootCommand, nvidiaDriverRoot, "/usr/bin/nvidia-smi", "-i", targetGPUUUID, "-pm", "0"},
)
if execErr != nil || stdErr != "" {
if strings.Contains(stdOut, "No devices were found") {
Expand Down Expand Up @@ -651,7 +652,7 @@ for PID_DIR in /proc/[0-9]*; do
done;
done;
`
checkNvidiaCommand := []string{"/usr/sbin/chroot", nvidiaDriverRoot, "sh", "-c", checkNvidiaShell}
checkNvidiaCommand := []string{nvidiaDriverChrootCommand, nvidiaDriverRoot, "sh", "-c", checkNvidiaShell}
stdOut, stdErr, execErr := execCommandInPod(
ctx,
clientset,
Expand All @@ -675,7 +676,7 @@ done;
nvidiaPod.Namespace,
nvidiaPod.Name,
nvidiaPod.Spec.Containers[0].Name,
[]string{"/usr/sbin/chroot", nvidiaDriverRoot, "/usr/bin/rm", "-f", "/dev/nvidia" + targetGPUDeviceMinor},
[]string{nvidiaDriverChrootCommand, nvidiaDriverRoot, "/usr/bin/rm", "-f", "/dev/nvidia" + targetGPUDeviceMinor},
)
if execErr != nil || stdErr != "" {
return fmt.Errorf("delete device file command 'remove file /dev/nvidiaX' failed: '%v', stderr: '%s', stdout: '%s'", execErr, stdErr, stdOut)
Expand All @@ -689,7 +690,7 @@ done;
nvidiaPod.Namespace,
nvidiaPod.Name,
nvidiaPod.Spec.Containers[0].Name,
[]string{"/usr/sbin/chroot", nvidiaDriverRoot, "/usr/bin/nvidia-smi", "drain", "-p", targetGPUBusID, "-m", "1"},
[]string{nvidiaDriverChrootCommand, nvidiaDriverRoot, "/usr/bin/nvidia-smi", "drain", "-p", targetGPUBusID, "-m", "1"},
)
if execErr != nil || stdErr != "" {
return fmt.Errorf("detach command 'set maintenance mode' failed: '%v', stderr: '%s', stdout: '%s'", execErr, stdErr, stdOut)
Expand All @@ -700,11 +701,11 @@ done;

isVM := isVMByCPUInfoInNvidiaDriverPod(ctx, clientset, restConfig, nvidiaPod, targetNodeName)
resetMethod := "nvidia-smi drain -r"
resetCommand := []string{"/usr/sbin/chroot", nvidiaDriverRoot, "/usr/bin/nvidia-smi", "drain", "-p", targetGPUBusID, "-r"}
resetCommand := []string{nvidiaDriverChrootCommand, nvidiaDriverRoot, "/usr/bin/nvidia-smi", "drain", "-p", targetGPUBusID, "-r"}
if isVM {
resetMethod = "sysfs remove"
busIDForSysfs := strings.ToLower(targetGPUBusID)
resetCommand = []string{"/usr/sbin/chroot", nvidiaDriverRoot, "/bin/sh", "-c", fmt.Sprintf("/usr/bin/echo 1 | /usr/bin/tee /sys/bus/pci/devices/%s/remove > /dev/null", busIDForSysfs)}
resetCommand = []string{nvidiaDriverChrootCommand, nvidiaDriverRoot, "/bin/sh", "-c", fmt.Sprintf("/usr/bin/echo 1 | /usr/bin/tee /sys/bus/pci/devices/%s/remove > /dev/null", busIDForSysfs)}
}
gpusLog.Info("selected GPU reset method for nvidia-driver-daemonset pod", "targetNodeName", targetNodeName, "targetGPUUUID", targetGPUUUID, "targetGPUBusID", targetGPUBusID, "isVM", isVM, "resetMethod", resetMethod)

Expand Down