Skip to content

Commit

Permalink
Merge pull request #13246 from tomponline/tp-vm-converge
Browse files Browse the repository at this point in the history
VM: Use auto-converge for all live migrations (from Incus)
  • Loading branch information
tomponline committed Apr 2, 2024
2 parents 56cf436 + 511e013 commit 9e4090b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
1 change: 0 additions & 1 deletion lxd/device/disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ func (d *disk) CanHotPlug() bool {
return true
}

// validateConfig checks the supplied config for correctness.
// isRequired indicates whether the supplied device config requires this device to start OK.
func (d *disk) isRequired(devConfig deviceConfig.Device) bool {
// Defaults to required.
Expand Down
11 changes: 11 additions & 0 deletions lxd/instance/drivers/driver_qemu.go
Original file line number Diff line number Diff line change
Expand Up @@ -6845,6 +6845,17 @@ func (d *qemu) migrateSendLive(pool storagePools.Pool, clusterMoveSourceName str
defer revert.Fail() // Run the revert fail before the earlier defers.

d.logger.Debug("Setup temporary migration storage snapshot")
} else {
// Still set some options for shared storage.
capabilities := map[string]bool{
// Automatically throttle down the guest to speed up convergence of RAM migration.
"auto-converge": true,
}

err = monitor.MigrateSetCapabilities(capabilities)
if err != nil {
return fmt.Errorf("Failed setting migration capabilities: %w", err)
}
}

// Perform storage transfer while instance is still running.
Expand Down

0 comments on commit 9e4090b

Please sign in to comment.