From 55a8c869f7598d78090bd32fd9aad616298417e1 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Thu, 13 Dec 2018 11:36:17 +0800 Subject: [PATCH] fix: gpu server not work --- pkg/compute/models/isolated_devices.go | 2 +- pkg/scheduler/api/sched.go | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/isolated_devices.go b/pkg/compute/models/isolated_devices.go index 7a9a8738de..fddde8e6b4 100644 --- a/pkg/compute/models/isolated_devices.go +++ b/pkg/compute/models/isolated_devices.go @@ -461,7 +461,7 @@ func (man *SIsolatedDeviceManager) GetSpecIdent(spec *jsonutils.JSONDict) []stri func (self *SIsolatedDevice) GetShortDesc() *jsonutils.JSONDict { desc := self.getDesc() - desc.Add(jsonutils.NewString(self.Keyword()), "res_name") + desc.Add(jsonutils.NewString(IsolatedDeviceManager.Keyword()), "res_name") return desc } diff --git a/pkg/scheduler/api/sched.go b/pkg/scheduler/api/sched.go index f4d0710610..1273704433 100644 --- a/pkg/scheduler/api/sched.go +++ b/pkg/scheduler/api/sched.go @@ -425,7 +425,14 @@ func (d *SchedData) fillIsolatedDeviceInfo(sjson *simplejson.Json) error { } dev, err := newIsolatedDeviceFromDesc(s.MustString()) if err != nil { - return err + dev = new(IsolatedDevice) + dev.ID = s.Get("id").MustString() + dev.Model = s.Get("model").MustString() + dev.Vendor = s.Get("vendor").MustString() + dev.Type = s.Get("dev_type").MustString() + if len(dev.ID) == 0 && len(dev.Model) == 0 { + return fmt.Errorf("Invalid isolated device description") + } } devs = append(devs, dev) }