github/intel-device-plugins-for-kubernetes
7
0
Fork 0
mirror of https://github.com/intel/intel-device-plugins-for-kubernetes.git synced 2025-06-03 03:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpu: move to using klog

Browse Source 
Move from fmt to klog for logging and debug.
Also add an extra info level message noting when we find
new devices.

Signed-off-by: Graham Whaley <graham.whaley@intel.com>
This commit is contained in:
Graham Whaley 2020-03-16 11:33:58 +00:00
parent 15d4b10715
commit 626bbb6ee2
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/gpu_plugin/gpu_plugin.go
View File

@ -26,9 +26,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"k8s.io/klog"
pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
"github.com/intel/intel-device-plugins-for-kubernetes/pkg/debug"
dpapi "github.com/intel/intel-device-plugins-for-kubernetes/pkg/deviceplugin" dpapi "github.com/intel/intel-device-plugins-for-kubernetes/pkg/deviceplugin"
) )
@ -65,10 +65,18 @@ func newDevicePlugin(sysfsDir, devfsDir string, sharedDevNum int) *devicePlugin
} }
func (dp *devicePlugin) Scan(notifier dpapi.Notifier) error { func (dp *devicePlugin) Scan(notifier dpapi.Notifier) error {
var previouslyFound int = -1
for { for {
devTree, err := dp.scan() devTree, err := dp.scan()
if err != nil { if err != nil {
fmt.Println("WARNING: Failed to scan: ", err) klog.Warning("Failed to scan: ", err)
}
found := len(devTree)
if found != previouslyFound {
klog.V(1).Info("GPU scan update: devices found: ", found)
previouslyFound = found
} }
notifier.Notify(devTree) notifier.Notify(devTree)
@ -88,18 +96,18 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
var nodes []pluginapi.DeviceSpec var nodes []pluginapi.DeviceSpec
if !dp.gpuDeviceReg.MatchString(f.Name()) { if !dp.gpuDeviceReg.MatchString(f.Name()) {
debug.Print("Not compatible device", f.Name()) klog.V(4).Info("Not compatible device", f.Name())
continue continue
} }
dat, err := ioutil.ReadFile(path.Join(dp.sysfsDir, f.Name(), "device/vendor")) dat, err := ioutil.ReadFile(path.Join(dp.sysfsDir, f.Name(), "device/vendor"))
if err != nil { if err != nil {
fmt.Println("WARNING: Skipping. Can't read vendor file: ", err) klog.Warning("Skipping. Can't read vendor file: ", err)
continue continue
} }
if strings.TrimSpace(string(dat)) != vendorString { if strings.TrimSpace(string(dat)) != vendorString {
debug.Print("Non-Intel GPU", f.Name()) klog.V(4).Info("Non-Intel GPU", f.Name())
continue continue
} }
@ -118,7 +126,7 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
continue continue
} }
debug.Printf("Adding %s to GPU %s", devPath, f.Name()) klog.V(4).Infof("Adding %s to GPU %s", devPath, f.Name())
nodes = append(nodes, pluginapi.DeviceSpec{ nodes = append(nodes, pluginapi.DeviceSpec{
HostPath: devPath, HostPath: devPath,
ContainerPath: devPath, ContainerPath: devPath,
@ -141,22 +149,16 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
func main() { func main() {
var sharedDevNum int var sharedDevNum int
var debugEnabled bool
flag.IntVar(&sharedDevNum, "shared-dev-num", 1, "number of containers sharing the same GPU device") flag.IntVar(&sharedDevNum, "shared-dev-num", 1, "number of containers sharing the same GPU device")
flag.BoolVar(&debugEnabled, "debug", false, "enable debug output")
flag.Parse() flag.Parse()
if debugEnabled {
debug.Activate()
}
if sharedDevNum < 1 { if sharedDevNum < 1 {
fmt.Println("The number of containers sharing the same GPU must greater than zero") klog.Warning("The number of containers sharing the same GPU must greater than zero")
os.Exit(1) os.Exit(1)
} }
fmt.Println("GPU device plugin started") klog.V(1).Info("GPU device plugin started")
plugin := newDevicePlugin(sysfsDrmDirectory, devfsDriDirectory, sharedDevNum) plugin := newDevicePlugin(sysfsDrmDirectory, devfsDriDirectory, sharedDevNum)
manager := dpapi.NewManager(namespace, plugin) manager := dpapi.NewManager(namespace, plugin)

5
cmd/gpu_plugin/gpu_plugin_test.go
View File

@ -15,18 +15,17 @@
package main package main
import ( import (
"flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path"
"testing" "testing"
"time" "time"
"github.com/intel/intel-device-plugins-for-kubernetes/pkg/debug"
) )
func init() { func init() {
debug.Activate() flag.Set("v", "4") //Enable debug output
} }
func TestScan(t *testing.T) { func TestScan(t *testing.T) {