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 #16306 from wanyaoqi/fix/set-queues-and-vectors-on-migrate

Browse Source 
fix(host): set desc nics queues and vectors on live migrate
This commit is contained in:
Zexi Li
2023-03-31 01:42:18 +08:00
committed by GitHub
parent eb866aa350 f97b6c0363
commit c647baa7e6
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/pci.go
+1 -1
View File
@@ -305,7 +305,7 @@ func (s *SKVMGuestInstance) initGuestNetworks(pciRoot, pciBridge *desc.PCIContro
s.Desc.Nics[i].Driver = "vmxnet3"
}
if s.Desc.Nics[i].NumQueues > 1 {
vectors := s.Desc.Nics[i].NumQueues * 2
vectors := s.Desc.Nics[i].NumQueues*2 + 1
s.Desc.Nics[i].Vectors = &vectors
}
pkg/hostman/guestman/qemu-kvm.go
+10
View File
@@ -177,8 +177,14 @@ func (s *SKVMGuestInstance) initLiveDescFromSourceGuest(srcDesc *desc.SGuestDesc
}
}
for i := 0; i < len(srcDesc.Nics); i++ {
var numQueues, vectors int
for j := 0; j < len(s.SourceDesc.Nics); j++ {
if srcDesc.Nics[i].Index == s.SourceDesc.Nics[j].Index {
numQueues = srcDesc.Nics[i].NumQueues
if srcDesc.Nics[i].Vectors != nil {
vectors = *srcDesc.Nics[i].Vectors
}
srcDesc.Nics[i].GuestnetworkJsonDesc = s.SourceDesc.Nics[j].GuestnetworkJsonDesc
break
}
@@ -187,6 +193,10 @@ func (s *SKVMGuestInstance) initLiveDescFromSourceGuest(srcDesc *desc.SGuestDesc
if err := s.generateNicScripts(srcDesc.Nics[i]); err != nil {
return errors.Wrapf(err, "generateNicScripts for nic: %v", srcDesc.Nics[i])
}
srcDesc.Nics[i].NumQueues = numQueues
if vectors > 0 {
srcDesc.Nics[i].Vectors = &vectors
}
srcDesc.Nics[i].UpscriptPath = s.getNicUpScriptPath(srcDesc.Nics[i])
srcDesc.Nics[i].DownscriptPath = s.getNicDownScriptPath(srcDesc.Nics[i])
}