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 #13996 from swordqiu/hotfix/qj-migrate-set-downtime-2

Browse Source 
fix: migrate set down time
This commit is contained in:
Zexi Li
2022-04-13 00:54:44 +08:00
committed by GitHub
parent 929e41233a 2cd805ead6
commit ef9bc82db3
6 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/instance_backup_delete_task.go
+1 -1
View File
@@ -61,13 +61,13 @@ func (self *InstanceBackupDeleteTask) OnKvmDiskBackupDelete(
backupId, _ := self.Params.GetString("del_backup_id")
// detach backup and instance
isjp := new(models.SInstanceBackupJoint)
isjp.SetModelManager(models.InstanceBackupJointManager, isjp)
err := models.InstanceBackupJointManager.Query().
Equals("instance_backup_id", isp.Id).Equals("disk_backup_id", backupId).First(isjp)
if err != nil {
self.taskFailed(ctx, isp, jsonutils.NewString(err.Error()))
return
}
isjp.SetModelManager(models.InstanceBackupJointManager, isjp)
err = isjp.Delete(ctx, self.UserCred)
if err != nil {
self.taskFailed(ctx, isp, jsonutils.NewString(err.Error()))
pkg/hostman/guestman/guesttasks.go
+1 -1
View File
@@ -772,7 +772,7 @@ func (s *SGuestLiveMigrateTask) doMigrate() {
}
func (s *SGuestLiveMigrateTask) onSetMigrateDowntime(res string) {
s.Monitor.MigrateSetDowntime(options.HostOptions.DefaultLiveMigrateDowntime, s.startMigrateStatusCheck)
s.Monitor.MigrateSetParameter("downtime-limit", int(options.HostOptions.DefaultLiveMigrateDowntime*1000), s.startMigrateStatusCheck)
}
func (s *SGuestLiveMigrateTask) startMigrateStatusCheck(res string) {
pkg/hostman/hostinfo/hostpinger.go
+2
View File
@@ -62,6 +62,7 @@ func NewHostPingTask(interval int) *SHostPingTask {
}
func (p *SHostPingTask) Start() {
log.Infof("Start host pinger ...")
var (
div = 1
hostId = Instance().GetHostId()
@@ -83,6 +84,7 @@ func (p *SHostPingTask) Start() {
}
func (p *SHostPingTask) ping(div int, hostId string) error {
log.Debugf("ping region at %d...", div)
res, err := modules.Hosts.PerformAction(hostutils.GetComputeSession(context.Background()),
hostId, "ping", nil)
if err != nil {
pkg/hostman/monitor/hmp.go
+1 -1
View File
@@ -312,7 +312,7 @@ func (m *HmpMonitor) MigrateSetCapability(capability, state string, callback Str
m.Query(fmt.Sprintf("migrate_set_capability %s %s", capability, state), callback)
}
func (m *HmpMonitor) MigrateSetParameter(key string, val string, callback StringCallback) {
func (m *HmpMonitor) MigrateSetParameter(key string, val interface{}, callback StringCallback) {
cmd := fmt.Sprintf("migrate_set_parameter %s %s", key, val)
m.Query(cmd, callback)
}
pkg/hostman/monitor/monitor.go
+1 -1
View File
@@ -177,7 +177,7 @@ type Monitor interface {
MigrateSetDowntime(dtSec float32, callback StringCallback)
MigrateSetCapability(capability, state string, callback StringCallback)
MigrateSetParameter(key, val string, callback StringCallback)
MigrateSetParameter(key string, val interface{}, callback StringCallback)
MigrateIncoming(address string, callback StringCallback)
Migrate(destStr string, copyIncremental, copyFull bool, callback StringCallback)
GetMigrateStatus(callback StringCallback)
pkg/hostman/monitor/qmp.go
+1 -1
View File
@@ -623,7 +623,7 @@ func (m *QmpMonitor) MigrateSetCapability(capability, state string, callback Str
m.Query(cmd, cb)
}
func (m *QmpMonitor) MigrateSetParameter(key string, val string, callback StringCallback) {
func (m *QmpMonitor) MigrateSetParameter(key string, val interface{}, callback StringCallback) {
var (
cb = func(res *Response) {
callback(m.actionResult(res))