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 #5178 from rainzm/bugfix/create_disk_for_vmware

Browse Source 
fix(esxi): No distinction between ordinary scsi and pvscsi when creating disks
This commit is contained in:
yunion-ci-robot
2020-02-19 17:49:26 +08:00
committed by GitHub
parent c0eb4d1e29 df3b77b764
commit eefe71add4
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/esxi/host.go
+6 -2
View File
@@ -879,7 +879,11 @@ func (host *SHost) CloneVM(ctx context.Context, from *SVirtualMachine, ds *SData
}
if len(scsiDevs) == 0 {
key := from.FindMinDiffKey(1000)
deviceChange = append(deviceChange, addDevSpec(NewSCSIDev(key, 100, "scsi")))
driver := "pvscsi"
if host.isVersion50() {
driver = "scsi"
}
deviceChange = append(deviceChange, addDevSpec(NewSCSIDev(key, 100, driver)))
ctlKey = key
} else {
ctlKey = minDevKey(scsiDevs)
@@ -914,7 +918,7 @@ func (host *SHost) CloneVM(ctx context.Context, from *SVirtualMachine, ds *SData
// find same disk
var index int32
var key int32 = 2000
sameDisk := from.FindDiskByDriver("scsi")
sameDisk := from.FindDiskByDriver("scsi", "pvscsi")
index += int32(len(sameDisk))
if len(sameDisk) > 0 {
key = minDiskKey(sameDisk)
pkg/multicloud/esxi/virtualmachine.go
+14 -6
View File
@@ -33,6 +33,7 @@ import (
"yunion.io/x/pkg/util/netutils"
"yunion.io/x/pkg/util/reflectutils"
"yunion.io/x/pkg/util/regutils"
"yunion.io/x/pkg/utils"
billing_api "yunion.io/x/onecloud/pkg/apis/billing"
api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -787,7 +788,7 @@ func (self *SVirtualMachine) GetVGADevice() string {
var (
driverTable = map[string][]string{
"sata": {"ahci"},
"scsi": {"lsilogic", "lsilogicsas", "buslogic"},
"scsi": {"parascsi", "lsilogic", "lsilogicsas", "buslogic"},
"pvscsi": {"parascsi"},
"ide": {"ide"},
}
@@ -838,10 +839,10 @@ func (self *SVirtualMachine) FindController(ctx context.Context, driver string)
return devs, nil
}
func (self *SVirtualMachine) FindDiskByDriver(driver string) []SVirtualDisk {
func (self *SVirtualMachine) FindDiskByDriver(drivers ...string) []SVirtualDisk {
disks := make([]SVirtualDisk, 0)
for i := range self.vdisks {
if self.vdisks[i].GetDriver() == driver {
if utils.IsInStringArray(self.vdisks[i].GetDriver(), drivers) {
disks = append(disks, self.vdisks[i])
}
}
@@ -849,6 +850,9 @@ func (self *SVirtualMachine) FindDiskByDriver(driver string) []SVirtualDisk {
}
func (self *SVirtualMachine) CreateDisk(ctx context.Context, sizeMb int, uuid string, driver string) error {
if driver == "pvscsi" {
driver = "scsi"
}
devs, err := self.FindController(ctx, driver)
if err != nil {
return err
@@ -857,10 +861,14 @@ func (self *SVirtualMachine) CreateDisk(ctx context.Context, sizeMb int, uuid st
return self.createDriverAndDisk(ctx, sizeMb, uuid, driver)
}
ctlKey := minDevKey(devs)
sameDisks := self.FindDiskByDriver(driver)
drivers := []string{driver}
if driver == "scsi" {
drivers = append(drivers, "pvscsi")
}
sameDisks := self.FindDiskByDriver(drivers...)
var diskKey int32 = 2000
if len(sameDisks) == 0 {
diskKey := self.FindMinDiffKey(2000)
if len(sameDisks) != 0 {
diskKey = minDiskKey(sameDisks)
}
index := len(sameDisks)