Merge pull request #1410 from jmencak/4.21-nvidia-smi-wrapper

NO-JIRA: Fix support for nvidia-smi

Author: openshift-merge-bot[bot]

assets/bin/nvidia-smi

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# This is a wrapper around /run/nvidia/driver/usr/bin/nvidia-smi binary,
+# which is populated by the NVIDIA GPU Operator on OpenShift.  The
+# binary will not exist unless the NVIDIA GPU Operator on OpenShift is
+# installed.  The primary use case is to set NVIDIA GPU frequencies and
+# power caps via TuneD.
+chroot /run/nvidia/driver /usr/bin/nvidia-smi "$@"

pkg/tuned/controller.go

@@ -84,7 +84,6 @@ const (
 	ocpTunedPersist       = ocpTunedRunDir + "/persist"
 	ocpTunedProvider      = ocpTunedHome + "/provider"
 	tunedPersistHome      = "/var/lib/tuned"
-	nvidiaDriverBinDir    = "/run/nvidia/driver/usr/bin"
 	// With the less aggressive rate limiter, retries will happen at 100ms*2^(retry_n-1):
 	// 100ms, 200ms, 400ms, 800ms, 1.6s, 3.2s, 6.4s, 12.8s, 25.6s, 51.2s, 102.4s, 3.4m, 6.8m, 13.7m, 27.3m
 	maxRetries = 15

pkg/tuned/run.go

@@ -23,8 +23,6 @@ import (
 	"time"
 
 	"k8s.io/klog/v2"
-
-	"github.com/openshift/cluster-node-tuning-operator/pkg/util"
 )
 
 func TunedCreateCmdline(debug bool) (string, []string) {
@@ -101,10 +99,6 @@ func TunedRunNoDaemon(timeout time.Duration) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	if err := util.AddToPath(nvidiaDriverBinDir); err != nil {
-		return err
-	}
-
 	command, args := TunedCreateCmdline(false)
 	if timeout > 0 {
 		// CommandContext sets Cancel to call the Kill (SIGKILL) method on the command's Process.
@@ -126,10 +120,6 @@ func TunedRunNoDaemon(timeout time.Duration) error {
 func TunedRun(cmd *exec.Cmd, daemon *Daemon, onDaemonReload func()) error {
 	klog.Infof("running cmd...")
 
-	if err := util.AddToPath(nvidiaDriverBinDir); err != nil {
-		return err
-	}
-
 	cmdReader, err := cmd.StderrPipe()
 	if err != nil {
 		return fmt.Errorf("error creating StderrPipe for tuned: %w", err)

pkg/util/os.go

@@ -1,13 +1,7 @@
 package util
 
 import (
-	"fmt"
 	"os"
-	"strings"
-)
-
-const (
-	pathSeparator = string(os.PathListSeparator)
 )
 
 // Delete a file if it exists.  Returns nil if 'file' does not exist.
@@ -31,21 +25,3 @@ func Symlink(target, linkName string) error {
 
 	return nil
 }
-
-// AddToPath adds 'path' to PATH environment variable unless it exists.
-// Returns nil unless os.Setenv() call fails.
-func AddToPath(path string) error {
-	currentPath := os.Getenv("PATH")
-
-	paths := strings.Split(currentPath, pathSeparator)
-	for _, p := range paths {
-		if p == path {
-			// 'path' already exists in PATH
-			return nil
-		}
-	}
-
-	newPath := fmt.Sprintf("%s%s%s", currentPath, pathSeparator, path)
-
-	return os.Setenv("PATH", newPath)
-}