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

Merge pull request #861 from Zexi/hotfix/host-delete-devices-undo-convert

Browse Source 
fix: host undo convert not delete isolated_devices
This commit is contained in:
yunion-ci-robot
2019-05-20 21:06:18 +08:00
committed by GitHub
parent 06e895da09 4cb35dd7be
commit 38047405b4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/isolated_devices.go
+2 -1
View File
@@ -589,7 +589,8 @@ func (manager *SIsolatedDeviceManager) FindByHost(id string) []SIsolatedDevice {
func (manager *SIsolatedDeviceManager) FindByHosts(ids []string) []SIsolatedDevice {
dest := make([]SIsolatedDevice, 0)
err := manager.Query().In("host_id", ids).All(&dest)
q := manager.Query().In("host_id", ids)
err := db.FetchModelObjects(manager, q, &dest)
if err != nil {
log.Errorln(err)
return nil
pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go
+1
View File
@@ -49,6 +49,7 @@ func (self *BaremetalUnconvertHypervisorTask) OnInit(ctx context.Context, obj db
} else {
self.OnGuestDeleteComplete(ctx, baremetal, nil)
}
models.IsolatedDeviceManager.DeleteDevicesByHost(ctx, self.GetUserCred(), baremetal)
}
func (self *BaremetalUnconvertHypervisorTask) OnGuestDeleteComplete(ctx context.Context, baremetal *models.SHost, body jsonutils.JSONObject) {