12630: Tweak nvidia warnings

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/lib/crunchrun/cuda.go b/lib/crunchrun/cuda.go
index 8282359eab486277ff8c548e83cc2fae84d514a2..6efc689baddad67fab36675c434e1a770449cad4 100644 (file)
--- a/lib/crunchrun/cuda.go
+++ b/lib/crunchrun/cuda.go
@@ -5,15 +5,13 @@
 package crunchrun
 
 import (
-       "fmt"
-       "io"
        "os/exec"
 )
 
 // nvidiaModprobe makes sure all the nvidia kernel modules and devices
 // are set up.  If we don't have all the modules/devices set up we get
 // "CUDA_ERROR_UNKNOWN".
-func nvidiaModprobe(writer io.Writer) {
+func nvidiaModprobe(writer *ThrottledLogger) {
        // The underlying problem is that when normally running
        // directly on the host, the CUDA SDK will automatically
        // detect and set up the devices on demand.  However, when
@@ -44,7 +42,7 @@ func nvidiaModprobe(writer io.Writer) {
        nvidiaSmi.Stderr = writer
        err := nvidiaSmi.Run()
        if err != nil {
-               writer.Write([]byte(fmt.Sprintf("nvidia-smi error: %v\n", err)))
+               writer.Printf("Warning - nvidia-smi: %v", err)
        }
 
        // Load the kernel modules & devices associated with
@@ -65,7 +63,7 @@ func nvidiaModprobe(writer io.Writer) {
                nvmodprobe.Stderr = writer
                err = nvmodprobe.Run()
                if err != nil {
-                       writer.Write([]byte(fmt.Sprintf("nvidia-modprobe error: %v\n", err)))
+                       writer.Printf("Warning: nvidia-modprobe: %v", err)
                }
        }
 }