From 5b1c97af58111980b7135c99ea8766cd65435750 Mon Sep 17 00:00:00 2001 From: Rain Date: Thu, 16 Jan 2020 21:00:15 +0800 Subject: [PATCH] bugfix(esxiagent): PrefetchImageCacheByCopy & SHost.FileUrlPathToDsPath 1. Fix the bug when preparing remote image by copy 2. SHost.FileUrlPathToDsPath will not work when shost has multiple storage. --- pkg/multicloud/esxi/host.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/multicloud/esxi/host.go b/pkg/multicloud/esxi/host.go index 5fbc851a05..f7e9a42d40 100644 --- a/pkg/multicloud/esxi/host.go +++ b/pkg/multicloud/esxi/host.go @@ -680,7 +680,7 @@ func (self *SHost) DoCreateVM(ctx context.Context, ds *SDatastore, data *jsonuti if len(cdromPath) != 0 && !strings.HasPrefix(cdromPath, "[") { cdromPath, err = self.FileUrlPathToDsPath(cdromPath) if err != nil { - return nil, errors.Wrapf(err, "SHost.FileUrlPathToDsPath", cdromPath) + return nil, errors.Wrapf(err, "SHost.FileUrlPathToDsPath") } } deviceChange = append(deviceChange, addDevSpec(NewCDROMDev(cdromPath, 16000, 201))) @@ -702,7 +702,7 @@ func (self *SHost) DoCreateVM(ctx context.Context, ds *SDatastore, data *jsonuti } else { imagePath, err = self.FileUrlPathToDsPath(imagePath) if err != nil { - return nil, errors.Wrapf(err, "SHost.FileUrlPathToDsPath", imagePath) + return nil, errors.Wrapf(err, "SHost.FileUrlPathToDsPath") } } uuid, _ := disk.GetString("disk_id")