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

fix(host): dest guest load pci addresses on live migrate

Browse Source 
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
This commit is contained in:
wanyaoqi
2023-03-01 22:57:53 +08:00
parent 06dfb5bbcb
commit 89f745ae0b
2 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+8 -1
View File
@@ -2904,9 +2904,16 @@ func (self *SGuest) SetBackupGuestStatus(userCred mcclient.TokenCredential, stat
}
func (self *SGuest) PerformStatus(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input apis.PerformStatusInput) (jsonutils.JSONObject, error) {
if input.HostId != "" && self.BackupHostId != "" && input.HostId == self.BackupHostId { // perform status called from slave guest
if input.HostId != "" && self.BackupHostId != "" && input.HostId == self.BackupHostId {
// perform status called from slave guest
return nil, self.SetBackupGuestStatus(userCred, input.Status, input.Reason)
}
if input.HostId != "" && input.HostId != self.HostId {
// perform status called from volatile host, eg: migrate dest host
return nil, nil
}
if input.PowerStates != "" {
if err := self.SetPowerStates(input.PowerStates); err != nil {
return nil, errors.Wrap(err, "set power states")
pkg/hostman/guestman/qemu-kvm.go
+29 -9
View File
@@ -163,18 +163,38 @@ func (s *SKVMGuestInstance) initLiveDescFromSourceGuest(srcDesc *desc.SGuestDesc
srcDesc.SGuestRegionDesc = s.SourceDesc.SGuestRegionDesc
srcDesc.SGuestControlDesc = s.SourceDesc.SGuestControlDesc
srcDesc.SGuestMetaDesc = s.SourceDesc.SGuestMetaDesc
for i := 0; i < len(s.SourceDesc.Cdroms); i++ {
for i := 0; i < len(srcDesc.Cdroms); i++ {
if i == len(s.SourceDesc.Cdroms) {
break
}
srcDesc.Cdroms[i].Path = s.SourceDesc.Cdroms[i].Path
}
for i := 0; i < len(s.SourceDesc.Disks); i++ {
srcDesc.Disks[i].GuestdiskJsonDesc = s.SourceDesc.Disks[i].GuestdiskJsonDesc
}
for i := 0; i < len(s.SourceDesc.Nics); i++ {
if err := s.generateNicScripts(s.SourceDesc.Nics[i]); err != nil {
return errors.Wrapf(err, "generateNicScripts for nic: %v", s.SourceDesc.Nics[i])
for i := 0; i < len(srcDesc.Disks); i++ {
for j := 0; j < len(s.SourceDesc.Disks); j++ {
if srcDesc.Disks[i].Index == s.SourceDesc.Disks[j].Index {
srcDesc.Disks[i].GuestdiskJsonDesc = s.SourceDesc.Disks[j].GuestdiskJsonDesc
}
}
srcDesc.Nics[i].UpscriptPath = s.getNicUpScriptPath(s.SourceDesc.Nics[i])
srcDesc.Nics[i].DownscriptPath = s.getNicDownScriptPath(s.SourceDesc.Nics[i])
}
for i := 0; i < len(srcDesc.Nics); i++ {
for j := 0; j < len(s.SourceDesc.Nics); j++ {
if srcDesc.Nics[i].Index == s.SourceDesc.Nics[j].Index {
srcDesc.Nics[i].GuestnetworkJsonDesc = s.SourceDesc.Nics[j].GuestnetworkJsonDesc
break
}
}
if err := s.generateNicScripts(srcDesc.Nics[i]); err != nil {
return errors.Wrapf(err, "generateNicScripts for nic: %v", srcDesc.Nics[i])
}
srcDesc.Nics[i].UpscriptPath = s.getNicUpScriptPath(srcDesc.Nics[i])
srcDesc.Nics[i].DownscriptPath = s.getNicDownScriptPath(srcDesc.Nics[i])
}
s.Desc = srcDesc
err := s.loadGuestPciAddresses()
if err != nil {
return errors.Wrap(err, "initLiveDescFromSourceGuest")
}
return s.SaveLiveDesc(srcDesc)
}