Skip to content

Commit c6e9cf0

Browse files
authored
fix(host): live migrate compat ipv6 (#23212)
1 parent 6d55de5 commit c6e9cf0

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

pkg/hostman/guestman/guesttasks.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"context"
1919
"fmt"
2020
"math"
21+
"net"
2122
"os"
2223
"path"
2324
"regexp"
@@ -1262,7 +1263,7 @@ func (s *SGuestLiveMigrateTask) waitMirrorJobsReady() {
12621263
s.waitMirrorJobsReady()
12631264
return
12641265
}
1265-
s.Monitor.Migrate(fmt.Sprintf("tcp:%s:%d", s.params.DestIp, s.params.DestPort),
1266+
s.Monitor.Migrate(fmt.Sprintf("tcp:%s", net.JoinHostPort(s.params.DestIp, strconv.Itoa(s.params.DestPort))),
12661267
false, false, s.setMaxBandwidth)
12671268
}
12681269
s.Monitor.GetBlockJobs(cb)
@@ -1313,7 +1314,7 @@ func (s *SGuestLiveMigrateTask) doMigrate() {
13131314
// copy disk data
13141315
copyIncremental = true
13151316
}
1316-
s.Monitor.Migrate(fmt.Sprintf("tcp:%s:%d", s.params.DestIp, s.params.DestPort),
1317+
s.Monitor.Migrate(fmt.Sprintf("tcp:%s", net.JoinHostPort(s.params.DestIp, strconv.Itoa(s.params.DestPort))),
13171318
copyIncremental, false, s.setMaxBandwidth)
13181319
}
13191320
}

pkg/hostman/guestman/qemu/generate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,10 +641,10 @@ func getMigrateOptions(drvOpt QemuOptions, input *GenerateStartOptionsInput) []s
641641
if input.LiveMigrateUseTLS {
642642
opts = append(opts, "-incoming defer")
643643
} else {
644-
opts = append(opts, fmt.Sprintf("-incoming tcp:0:%d", input.LiveMigratePort))
644+
opts = append(opts, fmt.Sprintf("-incoming tcp:[::]:%d", input.LiveMigratePort))
645645
}
646646
} else if input.GuestDesc.IsSlave {
647-
opts = append(opts, fmt.Sprintf("-incoming tcp:0:%d", input.LiveMigratePort))
647+
opts = append(opts, fmt.Sprintf("-incoming tcp:[::]:%d", input.LiveMigratePort))
648648
}
649649
return opts
650650
}

0 commit comments

Comments
 (0)