Repository navigation
Commit 44e85c5
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.
A unit test checks that the target host's value is sent, not cpus * speed.1 parent 0fa85dc commit 44e85c5
3 files changed
Lines changed: 24 additions & 4 deletions
File tree
- plugins/storage/volume/linstor
- src
- main/java/org/apache/cloudstack/storage/motion
- test/java/org/apache/cloudstack/storage/motion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
34 | 37 | | |
35 | 38 | | |
36 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| |||
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
81 | | - | |
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
| |||
426 | 426 | | |
427 | 427 | | |
428 | 428 | | |
| 429 | + | |
429 | 430 | | |
430 | | - | |
| 431 | + | |
431 | 432 | | |
432 | 433 | | |
433 | 434 | | |
| |||
449 | 450 | | |
450 | 451 | | |
451 | 452 | | |
452 | | - | |
453 | | - | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
454 | 459 | | |
455 | 460 | | |
456 | 461 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
| 146 | + | |
146 | 147 | | |
147 | 148 | | |
148 | 149 | | |
| |||
252 | 253 | | |
253 | 254 | | |
254 | 255 | | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
255 | 267 | | |
256 | 268 | | |
257 | 269 | | |
| |||
0 commit comments