Merge pull request #2737 from bobbypage/v0.37-gpu

bobbypage · web-flow · commit a63a71bd45cc · 2020-11-18T11:26:38.000-08:00
Cherrypick to v0.37: don't fail permenantly when nvml isn't installed
diff --git a/accelerators/nvidia.go b/accelerators/nvidia.go
@@ -58,9 +58,7 @@ func NewNvidiaManager(includedMetrics container.MetricSet) stats.Manager {
 	manager := &nvidiaManager{}
 	err := manager.setup()
 	if err != nil {
-		klog.Warningf("NVIDIA GPU metrics will not be available: %s", err)
-		manager.Destroy()
-		return &stats.NoopManager{}
+		klog.V(2).Infof("NVIDIA setup failed: %s", err)
 	}
 	return manager
 }

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,7 @@ func NewNvidiaManager(includedMetrics container.MetricSet) stats.Manager {`
`58`	`58`	`manager := &nvidiaManager{}`
`59`	`59`	`err := manager.setup()`
`60`	`60`	`if err != nil {`
`61`		`- klog.Warningf("NVIDIA GPU metrics will not be available: %s", err)`
`62`		`- manager.Destroy()`
`63`		`- return &stats.NoopManager{}`
	`61`	`+ klog.V(2).Infof("NVIDIA setup failed: %s", err)`
`64`	`62`	`}`
`65`	`63`	`return manager`
`66`	`64`	`}`