if the migration is an offline migration and when the mapping on
the target node exists, otherwise not
this does not change the behaviour for 'raw' devices in the config
those can still be forced to be migrated, like before
Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
www/manager6/window/Migrate.js | 52 +++++++++++++++++++++++++++-------
1 file changed, 42 insertions(+), 10 deletions(-)
diff --git a/www/manager6/window/Migrate.js b/www/manager6/window/Migrate.js
index 1c23abb3..c310342d 100644
--- a/www/manager6/window/Migrate.js
+++ b/www/manager6/window/Migrate.js
@@ -219,36 +219,68 @@ Ext.define('PVE.window.Migrate', {
let target = me.lookup('pveNodeSelector').value;
if (target.length &&
!migrateStats.allowed_nodes.includes(target)) {
let disallowed = migrateStats.not_allowed_nodes[target];
- let missingStorages =
disallowed.unavailable_storages.join(', ');
+ if (disallowed.unavailable_storages !== undefined) {
+ let missingStorages =
disallowed.unavailable_storages.join(', ');
- migration.possible = false;
- migration.preconditions.push({
- text: 'Storage (' + missingStorages + ') not available
on selected target. ' +
- 'Start VM to use live storage migration or select
other target node',
- severity: 'error',
- });
+ migration.possible = false;
+ migration.preconditions.push({
+ text: 'Storage (' + missingStorages + ') not
available on selected target. ' +
+ 'Start VM to use live storage migration or select
other target node',
+ severity: 'error',
+ });
+ }
+
+ if (disallowed['unavailable-resources'] !== undefined) {
+ let unavailableResources =
disallowed['unavailable-resources'].join(', ');
+
+ migration.possible = false;
+ migration.preconditions.push({
+ text: 'Mapped Resources (' + unavailableResources +
') not available on selected target. ',
+ severity: 'error',
+ });
+ }
}
}
- if (migrateStats.local_resources.length) {
+ let blockingResources = [];
+ let mappedResources = migrateStats['mapped-resources'] ?? [];
+
+ for (const res of migrateStats.local_resources) {
+ if (mappedResources.indexOf(res) === -1) {
+ blockingResources.push(res);
+ }
+ }
+
+ if (blockingResources.length) {
migration.hasLocalResources = true;
if (!migration.overwriteLocalResourceCheck ||
vm.get('running')) {
migration.possible = false;
migration.preconditions.push({
text: Ext.String.format('Can\'t migrate VM with local
resources: {0}',
- migrateStats.local_resources.join(', ')),
+ blockingResources.join(', ')),
severity: 'error',
});
} else {
migration.preconditions.push({
text: Ext.String.format('Migrate VM with local
resources: {0}. ' +
'This might fail if resources aren\'t available on the
target node.',
- migrateStats.local_resources.join(', ')),
+ blockingResources.join(', ')),
severity: 'warning',
});
}
}
+ if (mappedResources && mappedResources.length) {
+ if (vm.get('running')) {
+ migration.possible = false;
+ migration.preconditions.push({
+ text: Ext.String.format('Can\'t migrate running VM with
mapped resources: {0}',
+ mappedResources.join(', ')),
+ severity: 'error',
+ });
+ }
+ }
+
if (migrateStats.local_disks.length) {
migrateStats.local_disks.forEach(function(disk) {
if (disk.cdrom && disk.cdrom === 1) {
--
2.30.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
