From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v3 container 1/5] use new move_config_to_node method
Date: Tue, 1 Dec 2020 13:06:58 +0100 [thread overview]
Message-ID: <20201201120702.3869-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20201201120702.3869-1-f.ebner@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Required dependency on libpve-guest-common-perl >=3.1-3
src/PVE/LXC/Migrate.pm | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
index 7c3536f..cb1ea7a 100644
--- a/src/PVE/LXC/Migrate.pm
+++ b/src/PVE/LXC/Migrate.pm
@@ -301,9 +301,6 @@ sub phase1 {
}
}
- my $conffile = PVE::LXC::Config->config_file($vmid);
- my $newconffile = PVE::LXC::Config->config_file($vmid, $self->{node});
-
if ($self->{running}) {
die "implement me";
}
@@ -318,15 +315,10 @@ sub phase1 {
my $vollist = PVE::LXC::Config->get_vm_volumes($conf);
PVE::Storage::deactivate_volumes($self->{storecfg}, $vollist);
- # transfer replication state before move config
+ # transfer replication state before moving config
$self->transfer_replication_state() if $rep_volumes;
-
- # move config
- die "Failed to move config to node '$self->{node}' - rename failed: $!\n"
- if !rename($conffile, $newconffile);
-
+ PVE::LXC::Config->move_config_to_node($vmid, $self->{node});
$self->{conf_migrated} = 1;
-
$self->switch_replication_job_target() if $rep_volumes;
}
--
2.20.1
next prev parent reply other threads:[~2020-12-01 12:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 12:06 [pve-devel] [PATCH-SERIES v3] migration tests Fabian Ebner
2020-12-01 12:06 ` Fabian Ebner [this message]
2020-12-01 12:06 ` [pve-devel] [PATCH v3 qemu-server 2/5] use new move_config_to_node method Fabian Ebner
2020-12-01 12:07 ` [pve-devel] [PATCH v3 qemu-server 3/5] migration: factor out starting remote tunnel Fabian Ebner
2020-12-01 12:07 ` [pve-devel] [PATCH v3 qemu-server 4/5] migration: sort volumes migrated with storage_migrate Fabian Ebner
2020-12-01 12:07 ` [pve-devel] [PATCH v3 qemu-server 5/5] create test environment for migration Fabian Ebner
2020-12-15 15:20 ` [pve-devel] applied-series: [PATCH-SERIES v3] migration tests Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201201120702.3869-2-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox