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

Merge pull request #13000 from swordqiu/automated-cherry-pick-of-#12998-upstream-release-3.7

Browse Source 
Automated cherry pick of #12998: fix: migrate timeout error
This commit is contained in:
Zexi Li
2021-12-23 09:59:07 +08:00
committed by GitHub
parent 23d40f27d0 13671ee635
commit f7ba89055e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/guesttasks.go
+3 -3
View File
@@ -513,8 +513,8 @@ func (s *SGuestLiveMigrateTask) startMigrate(res string) {
if migSeconds < options.HostOptions.MinMigrateTimeoutSeconds {
migSeconds = options.HostOptions.MinMigrateTimeoutSeconds
}
log.Infof("migrate timeout seconds: %d", migSeconds)
s.timeoutAt = time.Now().Add(time.Second * time.Duration(migSeconds))
log.Infof("migrate timeout seconds: %d now: %v expectfinial: %v", migSeconds, time.Now(), s.timeoutAt)
var copyIncremental = false
if s.params.IsLocal {
copyIncremental = true
@@ -549,8 +549,8 @@ func (s *SGuestLiveMigrateTask) onGetMigrateStatus(status string) {
s.migrateTask = nil
close(s.c)
hostutils.TaskFailed(s.ctx, fmt.Sprintf("Query migrate got status: %s", status))
} else if !s.doTimeoutMigrate {
if s.timeoutAt.After(time.Now()) {
} else if !s.params.IsLocal && !s.doTimeoutMigrate {
if s.timeoutAt.Before(time.Now()) {
log.Warningf("migrate timeout, force stop to finish migrate")
// timeout, start memory postcopy
// https://wiki.qemu.org/Features/PostCopyLiveMigration