From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 container 2/5] Use new move_config_to_node method
Date: Thu, 20 Aug 2020 11:11:39 +0200 [thread overview]
Message-ID: <20200820091142.23210-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20200820091142.23210-1-f.ebner@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
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 90d74b4..d2938f6 100644
--- a/src/PVE/LXC/Migrate.pm
+++ b/src/PVE/LXC/Migrate.pm
@@ -302,9 +302,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";
}
@@ -319,15 +316,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-08-20 9:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 9:11 [pve-devel] [PATCH v2 guest-common 1/5] Add " Fabian Ebner
2020-08-20 9:11 ` Fabian Ebner [this message]
2020-08-20 9:11 ` [pve-devel] [PATCH v2 qemu-server 3/5] Use new " Fabian Ebner
2020-08-20 9:11 ` [pve-devel] [PATCH v2 qemu-server 4/5] migration: factor out starting remote tunnel Fabian Ebner
2020-08-20 9:11 ` [pve-devel] [PATCH v2 qemu-server 5/5] create test environment for QemuMigrate.pm Fabian Ebner
2020-08-24 7:45 ` [pve-devel] applied: [PATCH v2 guest-common 1/5] Add move_config_to_node method 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=20200820091142.23210-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal