migrate: unlink unix socket before starting migration

Just to be sure nobody else has (wrongfully) left that file here.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 89c765bc19df83582221fa7d012b9ca43d1d35a9..baf736421c453bca79a8954a0068eb29f8a1c1bc 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -422,6 +422,7 @@ sub phase2 {
        $self->log('info', "start remote tunnel");
 
        if ($ruri =~ /^unix:/) {
+           unlink $raddr;
            $self->{tunnel} = $self->fork_tunnel("$raddr:$raddr");
            $self->{tunnel}->{sock_addr} = $raddr;
 

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 8e76303fe2d40469fe6fe34f48c39af1849d501e..9b8110e0fecc3efe65d5fbd6927673b0777b6926 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4306,7 +4306,10 @@ sub vm_start {
                # should be default for secure migrations as a ssh TCP forward
                # tunnel is not deterministic reliable ready and fails regurarly
                # to set up in time, so use UNIX socket forwards
-               $migrate_uri = "unix:/run/qemu-server/$vmid.migrate";
+               my $socket_addr = "/run/qemu-server/$vmid.migrate";
+               unlink $socket_addr;
+
+               $migrate_uri = "unix:$socket_addr";
 
                push @$cmd, '-incoming', $migrate_uri;
                push @$cmd, '-S';