Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-01-08 21:18:03 +03:00
Code Releases Activity

migration: implement insecure offline migration

Browse Source
This commit is contained in:
Wolfgang Bumiller 2017-05-30 15:30:13 +02:00 committed by Dietmar Maurer
parent af6d2db4b3
commit f1c2a53aee
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
PVE/QemuMigrate.pm
View File

@ -399,7 +399,8 @@ sub sync_disks {
push @{$self->{online_local_volumes}}, $volid; push @{$self->{online_local_volumes}}, $volid;
} else { } else {
push @{$self->{volumes}}, $volid; push @{$self->{volumes}}, $volid;
PVE::Storage::storage_migrate($self->{storecfg}, $volid, $self->{ssh_info}, $sid); my $insecure = $self->{opts}->{migration_type} eq 'insecure';
PVE::Storage::storage_migrate($self->{storecfg}, $volid, $self->{ssh_info}, $sid, undef, undef, undef, undef, $insecure);
} }
} }
}; };
@ -435,6 +436,20 @@ sub phase1 {
$conf->{lock} = 'migrate'; $conf->{lock} = 'migrate';
PVE::QemuConfig->write_config($vmid, $conf); PVE::QemuConfig->write_config($vmid, $conf);
# we use TCP only for unsecure migrations as TCP ssh forward tunnels often
# did appeared to late (they are hard, if not impossible, to check for)
# secure migration use UNIX sockets now, this *breaks* compatibilty when trying
# to migrate from new to old but *not* from old to new.
my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
my $migration_type = 'secure';
if (defined($self->{opts}->{migration_type})) {
$migration_type = $self->{opts}->{migration_type};
} elsif (defined($datacenterconf->{migration}->{type})) {
$migration_type = $datacenterconf->{migration}->{type};
}
$self->{opts}->{migration_type} = $migration_type;
sync_disks($self, $vmid); sync_disks($self, $vmid);
}; };
@ -482,18 +497,7 @@ sub phase2 {
push @$cmd , 'qm', 'start', $vmid, '--skiplock', '--migratedfrom', $nodename; push @$cmd , 'qm', 'start', $vmid, '--skiplock', '--migratedfrom', $nodename;
# we use TCP only for unsecure migrations as TCP ssh forward tunnels often my $migration_type = $self->{opts}->{migration_type};
# did appeared to late (they are hard, if not impossible, to check for)
# secure migration use UNIX sockets now, this *breaks* compatibilty when trying
# to migrate from new to old but *not* from old to new.
my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
my $migration_type = 'secure';
if (defined($self->{opts}->{migration_type})) {
$migration_type = $self->{opts}->{migration_type};
} elsif (defined($datacenterconf->{migration}->{type})) {
$migration_type = $datacenterconf->{migration}->{type};
}
push @$cmd, '--migration_type', $migration_type; push @$cmd, '--migration_type', $migration_type;