opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #750 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-region-gpu-not-work to release/2.3.0

Browse Source 
* commit '55a8c869f7598d78090bd32fd9aad616298417e1':
  fix: gpu server not work
This commit is contained in:
邱剑
2018-12-13 11:54:52 +08:00
parent 34aa2a5ff8 55a8c869f7
commit 4ec6a728f9
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/isolated_devices.go
+1 -1
View File
@@ -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
}
pkg/scheduler/api/sched.go
+8 -1
View File
@@ -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)
}