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

Move GPU plugin CLI options to a struct

Browse Source 
To help in:
* adding more CLI options in next and later commits, and
* to replace magic newDevicePlugin() input parameters with
  explicitly named one(s)
This commit is contained in:
Eero Tamminen 2021-04-19 18:58:35 +03:00
parent 06fac8128f
commit 713c1ab170
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/gpu_plugin/gpu_plugin.go
View File

@ -51,11 +51,15 @@ const (
scanPeriod = 5 * time.Second scanPeriod = 5 * time.Second
) )
type cliOptions struct {
sharedDevNum int
}
type devicePlugin struct { type devicePlugin struct {
sysfsDir string sysfsDir string
devfsDir string devfsDir string
sharedDevNum int options cliOptions
gpuDeviceReg *regexp.Regexp gpuDeviceReg *regexp.Regexp
controlDeviceReg *regexp.Regexp controlDeviceReg *regexp.Regexp
@ -64,11 +68,11 @@ type devicePlugin struct {
scanDone chan bool scanDone chan bool
} }
func newDevicePlugin(sysfsDir, devfsDir string, sharedDevNum int) *devicePlugin { func newDevicePlugin(sysfsDir, devfsDir string, options cliOptions) *devicePlugin {
return &devicePlugin{ return &devicePlugin{
sysfsDir: sysfsDir, sysfsDir: sysfsDir,
devfsDir: devfsDir, devfsDir: devfsDir,
sharedDevNum: sharedDevNum, options: options,
gpuDeviceReg: regexp.MustCompile(gpuDeviceRE), gpuDeviceReg: regexp.MustCompile(gpuDeviceRE),
controlDeviceReg: regexp.MustCompile(controlDeviceRE), controlDeviceReg: regexp.MustCompile(controlDeviceRE),
scanTicker: time.NewTicker(scanPeriod), scanTicker: time.NewTicker(scanPeriod),
@ -168,7 +172,7 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
if len(nodes) > 0 { if len(nodes) > 0 {
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil) deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil)
for i := 0; i < dp.sharedDevNum; i++ { for i := 0; i < dp.options.sharedDevNum; i++ {
devID := fmt.Sprintf("%s-%d", f.Name(), i) devID := fmt.Sprintf("%s-%d", f.Name(), i)
// Currently only one device type (i915) is supported. // Currently only one device type (i915) is supported.
// TODO: check model ID to differentiate device models. // TODO: check model ID to differentiate device models.
@ -186,19 +190,19 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
} }
func main() { func main() {
var sharedDevNum int var opts cliOptions
flag.IntVar(&sharedDevNum, "shared-dev-num", 1, "number of containers sharing the same GPU device") flag.IntVar(&opts.sharedDevNum, "shared-dev-num", 1, "number of containers sharing the same GPU device")
flag.Parse() flag.Parse()
if sharedDevNum < 1 { if opts.sharedDevNum < 1 {
klog.Warning("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)
} }
klog.V(1).Info("GPU device plugin started") klog.V(1).Info("GPU device plugin started")
plugin := newDevicePlugin(sysfsDrmDirectory, devfsDriDirectory, sharedDevNum) plugin := newDevicePlugin(sysfsDrmDirectory, devfsDriDirectory, opts)
manager := dpapi.NewManager(namespace, plugin) manager := dpapi.NewManager(namespace, plugin)
manager.Run() manager.Run()
} }

4
cmd/gpu_plugin/gpu_plugin_test.go
View File

@ -155,6 +155,8 @@ func TestScan(t *testing.T) {
}, },
} }
opts := cliOptions{sharedDevNum: 1}
for _, tc := range tcases { for _, tc := range tcases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
root, err := ioutil.TempDir("", "test_new_device_plugin") root, err := ioutil.TempDir("", "test_new_device_plugin")
@ -169,7 +171,7 @@ func TestScan(t *testing.T) {
t.Errorf("unexpected error: %+v", err) t.Errorf("unexpected error: %+v", err)
} }
plugin := newDevicePlugin(sysfs, devfs, 1) plugin := newDevicePlugin(sysfs, devfs, opts)
notifier := &mockNotifier{ notifier := &mockNotifier{
scanDone: plugin.scanDone, scanDone: plugin.scanDone,