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

fix: qmp free port test (#19152)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2024-01-02 14:00:21 +08:00
committed by GitHub
co-authored by Qiu Jian
parent ed79e40429
commit 345a86f7c1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/guestman.go
+2 -1
View File
@@ -1204,7 +1204,8 @@ func (m *SGuestManager) GetFreeVncPort() int {
for {
if _, ok := vncPorts[port]; ok ||
netutils2.IsTcpPortUsed("0.0.0.0", VNC_PORT_BASE+port) ||
netutils2.IsTcpPortUsed("127.0.0.1", MONITOR_PORT_BASE+port) {
netutils2.IsTcpPortUsed("127.0.0.1", MONITOR_PORT_BASE+port) ||
netutils2.IsTcpPortUsed("127.0.0.1", QMP_MONITOR_PORT_BASE+port) {
port += 1
} else {
if !m.checkAndSetPort(port) {
pkg/hostman/guestman/qemu-kvm.go
+2 -1
View File
@@ -80,6 +80,7 @@ import (
const (
STATE_FILE_PREFIX = "STATEFILE"
MONITOR_PORT_BASE = 55900
QMP_MONITOR_PORT_BASE = 56100
LIVE_MIGRATE_PORT_BASE = 4396
BUILT_IN_NBD_SERVER_PORT_BASE = 7777
MAX_TRY = 3
@@ -1545,7 +1546,7 @@ func (s *SKVMGuestInstance) GetQmpMonitorPort(vncPort int) int {
vncPort = s.GetVncPort()
}
if vncPort > 0 {
return vncPort + MONITOR_PORT_BASE + 200
return vncPort + QMP_MONITOR_PORT_BASE
} else {
return -1
}