Visitar URL original
linstor: use the target host's CPU shares for live migration with sto… · apache/cloudstack@0a1c6da · GitHub
Skip to content

Commit 0a1c6da

Browse files
rp-rp-
committed
linstor: use the target host's CPU shares for live migration with storage
LinstorDataMotionStrategy set the MigrateCommand CPU shares to the raw cpus * speed value, which is only valid on cgroup v1. On cgroup v2 hosts the source agent's updateVmSharesIfNeeded() sees that it differs from its own scaled value and writes it into the migration XML, so libvirt on the target rejects VMs above 10000 with "shares '<n>' must be in range [1, 10000]", and smaller VMs end up with an unscaled CPU weight. Use the value the target host calculated and returned in the PrepareForMigrationAnswer, as StorageSystemDataMotionStrategy and VirtualMachineManagerImpl do.
1 parent 573cea3 commit 0a1c6da

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

‎plugins/storage/volume/linstor/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3131
- Live migration with storage into Linstor failed with "cannot precreate storage for disk type 'block'"
3232
if the auto-placement didn't put a copy of the new resource on the target host; the resource is
3333
now made available on the target host before the migration starts.
34+
- Live migration with storage into Linstor failed on cgroup v2 hosts with
35+
"shares '<n>' must be in range [1, 10000]" for VMs with more than 10000 cpus * MHz, and smaller
36+
VMs ended up with an unscaled CPU weight; the CPU shares calculated by the target host are now used.
3437

3538
## [2026-06-24]
3639

‎plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/motion/LinstorDataMotionStrategy.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.cloud.agent.api.Answer;
3939
import com.cloud.agent.api.MigrateAnswer;
4040
import com.cloud.agent.api.MigrateCommand;
41+
import com.cloud.agent.api.PrepareForMigrationAnswer;
4142
import com.cloud.agent.api.PrepareForMigrationCommand;
4243
import com.cloud.agent.api.to.DataObjectType;
4344
import com.cloud.agent.api.to.VirtualMachineTO;
@@ -75,7 +76,6 @@
7576
import org.apache.cloudstack.storage.datastore.util.LinstorUtil;
7677
import org.apache.commons.collections.CollectionUtils;
7778
import org.apache.commons.collections.MapUtils;
78-
import org.apache.commons.lang3.ObjectUtils;
7979
import org.apache.logging.log4j.LogManager;
8080
import org.apache.logging.log4j.Logger;
8181
import org.springframework.stereotype.Component;
@@ -407,8 +407,9 @@ public void copyAsync(Map<VolumeInfo, DataStore> volumeDataStoreMap, VirtualMach
407407
}
408408

409409
PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(vmTO);
410+
Answer pfma;
410411
try {
411-
Answer pfma = _agentManager.send(destHost.getId(), pfmc);
412+
pfma = _agentManager.send(destHost.getId(), pfmc);
412413

413414
if (pfma == null || !pfma.getResult()) {
414415
String details = pfma != null ? pfma.getDetails() : "null answer returned";
@@ -430,8 +431,12 @@ public void copyAsync(Map<VolumeInfo, DataStore> volumeDataStoreMap, VirtualMach
430431
migrateCommand.setWait(StorageManager.KvmStorageOnlineMigrationWait.value());
431432
migrateCommand.setMigrateStorage(migrateStorage);
432433
migrateCommand.setMigrateStorageManaged(true);
433-
migrateCommand.setNewVmCpuShares(
434-
vmTO.getCpus() * ObjectUtils.defaultIfNull(vmTO.getMinSpeed(), vmTO.getSpeed()));
434+
// the target host scales the shares to its cgroup version (v2 only accepts 1-10000),
435+
// the raw cpus * speed value is only valid on cgroup v1
436+
Integer newVmCpuShares = ((PrepareForMigrationAnswer) pfma).getNewVmCpuShares();
437+
if (newVmCpuShares != null) {
438+
migrateCommand.setNewVmCpuShares(newVmCpuShares);
439+
}
435440
migrateCommand.setMigrateDiskInfoList(migrateDiskInfoList);
436441

437442
boolean kvmAutoConvergence = StorageManager.KvmAutoConvergence.value();

0 commit comments

Comments
 (0)