proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-02 21:14:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor migration IP retrieval

Browse Source 
since PVE::Cluster::get_local_migration_ip does not exist anymore. this
is basically an inlined version, since this is the only remaining caller
that we actually want to keep.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2019-11-11 11:28:30 +01:00 committed by Thomas Lamprecht
parent 95896f80c2
commit b24e1ac224
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
PVE/QemuServer.pm
View File

@ -5332,6 +5332,35 @@ sub vm_start {
my ($cmd, $vollist, $spice_port) = config_to_command($storecfg, $vmid, $conf, $defaults, $forcemachine); my ($cmd, $vollist, $spice_port) = config_to_command($storecfg, $vmid, $conf, $defaults, $forcemachine);
my $migration_ip;
my $get_migration_ip = sub {
my ($cidr, $nodename) = @_;
return $migration_ip if defined($migration_ip);
if (!defined($cidr)) {
my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg');
$cidr = $dc_conf->{migration}->{network};
}
if (defined($cidr)) {
my $ips = PVE::Network::get_local_ip_from_cidr($cidr);
die "could not get IP: no address configured on local " .
"node for network '$cidr'\n" if scalar(@$ips) == 0;
die "could not get IP: multiple addresses configured on local " .
"node for network '$cidr'\n" if scalar(@$ips) > 1;
$migration_ip = @$ips[0];
}
$migration_ip = PVE::Cluster::remote_node_ip($nodename, 1)
if !defined($migration_ip);
return $migration_ip;
};
my $migrate_uri; my $migrate_uri;
if ($statefile) { if ($statefile) {
if ($statefile eq 'tcp') { if ($statefile eq 'tcp') {
@ -5348,13 +5377,7 @@ sub vm_start {
} }
if ($migration_type eq 'insecure') { if ($migration_type eq 'insecure') {
my $migrate_network_addr = PVE::Cluster::get_local_migration_ip($migration_network); $localip = $get_migration_ip->($migration_network, $nodename);
if ($migrate_network_addr) {
$localip = $migrate_network_addr;
} else {
$localip = PVE::Cluster::remote_node_ip($nodename, 1);
}
$localip = "[$localip]" if Net::IP::ip_is_ipv6($localip); $localip = "[$localip]" if Net::IP::ip_is_ipv6($localip);
} }
@ -5484,8 +5507,7 @@ sub vm_start {
#start nbd server for storage migration #start nbd server for storage migration
if ($targetstorage) { if ($targetstorage) {
my $nodename = PVE::INotify::nodename(); my $nodename = PVE::INotify::nodename();
my $migrate_network_addr = PVE::Cluster::get_local_migration_ip($migration_network); my $localip = $get_migration_ip->($migration_network, $nodename);
my $localip = $migrate_network_addr ? $migrate_network_addr : PVE::Cluster::remote_node_ip($nodename, 1);
my $pfamily = PVE::Tools::get_host_address_family($nodename); my $pfamily = PVE::Tools::get_host_address_family($nodename);
my $storage_migrate_port = PVE::Tools::next_migrate_port($pfamily); my $storage_migrate_port = PVE::Tools::next_migrate_port($pfamily);