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 #1117 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-vmware-sync-hoststorage-ignore-storage to release/2.6.0

Browse Source 
* commit '59cab59e5ea800392c87e311d9e15ee7ea26aa17':
  fix: ignore syncing storage when syncing vmware hosts
This commit is contained in:
邱剑
2019-02-25 17:31:42 +08:00
parent 044fbf14ac 59cab59e5e
commit 6ced91d2db
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+7 -1
View File
@@ -1500,7 +1500,13 @@ func (self *SHost) SyncHostStorages(ctx context.Context, userCred mcclient.Token
func (self *SHost) syncWithCloudHostStorage(localStorage *SStorage, extStorage cloudprovider.ICloudStorage) error {
// do nothing
hs := self.GetHoststorageOfId(localStorage.Id)
return hs.syncWithCloudHostStorage(extStorage)
err := hs.syncWithCloudHostStorage(extStorage)
if err != nil {
return err
}
s := hs.GetStorage()
err = s.syncWithCloudStorage(extStorage)
return err
}
func (self *SHost) isAttach2Storage(storage *SStorage) bool {