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 #11108 from rainzm/automated-cherry-pick-of-#11107-upstream-release-3.7

Browse Source 
Automated cherry pick of #11107: fix(esxiagent): make the copied disk type as thin
This commit is contained in:
Zexi Li
2021-05-17 10:07:02 +08:00
committed by GitHub
parent f0ec3269f6 f6bf63fa89
commit ab68eee123
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/esxi/host.go
+17 -3
View File
@@ -820,10 +820,24 @@ func (self *SHost) addDisks(ctx context.Context, dc *SDatacenter, ds *SDatastore
return nil, errors.Wrapf(err, "SHost.FileUrlPathToDsPath")
}
newImagePath := fmt.Sprintf("[%s] %s/%s.vmdk", ds.GetRelName(), uuid, uuid)
fm := ds.getDatastoreObj().NewFileManager(dc.getObjectDatacenter(), true)
err = fm.Copy(ctx, imagePath, newImagePath)
dm := object.NewVirtualDiskManager(self.manager.client.Client)
spec := &types.VirtualDiskSpec{
DiskType: "thin",
}
switch disk.Driver {
case "", "scsi", "pvscsi":
spec.AdapterType = "lsiLogic"
default:
spec.AdapterType = "ide"
}
task, err := dm.CopyVirtualDisk(self.manager.context, imagePath, self.datacenter.getDcObj(), newImagePath, self.datacenter.getDcObj(), spec, true)
if err != nil {
return nil, errors.Wrap(err, "unable to copy system disk")
return nil, errors.Wrap(err, "unable to CopyVirtualDisk")
}
err = task.Wait(self.manager.context)
if err != nil {
return nil, errors.Wrap(err, "waith CopyVirtualDiskTask")
}
imagePath = newImagePath
rootDiskSizeMb = size