From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v4 container 9/9] api: move-volume: cleanup very long lines
Date: Tue, 2 Nov 2021 16:03:35 +0100 [thread overview]
Message-ID: <20211102150335.2371545-10-a.lauterer@proxmox.com> (raw)
In-Reply-To: <20211102150335.2371545-1-a.lauterer@proxmox.com>
Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
src/PVE/API2/LXC.pm | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index afc16d7..d8afbbc 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -1847,13 +1847,15 @@ __PACKAGE__->register_method({
}),
delete => {
type => 'boolean',
- description => "Delete the original volume after successful copy. By default the original is kept as an unused volume entry.",
+ description => "Delete the original volume after successful copy. By default the " .
+ "original is kept as an unused volume entry.",
optional => 1,
default => 0,
},
digest => {
type => 'string',
- description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.',
+ description => 'Prevent changes if current configuration file has different SHA1 " .
+ "digest. This can be used to prevent concurrent modifications.',
maxLength => 40,
optional => 1,
},
@@ -1936,7 +1938,11 @@ __PACKAGE__->register_method({
my $storage_realcmd = sub {
eval {
- PVE::Cluster::log_msg('info', $authuser, "move volume CT $vmid: move --volume $mpkey --storage $storage");
+ PVE::Cluster::log_msg(
+ 'info',
+ $authuser,
+ "move volume CT $vmid: move --volume $mpkey --storage $storage"
+ );
my $conf = PVE::LXC::Config->load_config($vmid);
my $storage_cfg = PVE::Storage::config();
@@ -1947,8 +1953,20 @@ __PACKAGE__->register_method({
PVE::Storage::activate_volumes($storage_cfg, [ $old_volid ]);
my $bwlimit = extract_param($param, 'bwlimit');
my $source_storage = PVE::Storage::parse_volume_id($old_volid);
- my $movelimit = PVE::Storage::get_bandwidth_limit('move', [$source_storage, $storage], $bwlimit);
- $new_volid = PVE::LXC::copy_volume($mpdata, $vmid, $storage, $storage_cfg, $conf, undef, $movelimit);
+ my $movelimit = PVE::Storage::get_bandwidth_limit(
+ 'move',
+ [$source_storage, $storage],
+ $bwlimit
+ );
+ $new_volid = PVE::LXC::copy_volume(
+ $mpdata,
+ $vmid,
+ $storage,
+ $storage_cfg,
+ $conf,
+ undef,
+ $movelimit
+ );
if (PVE::LXC::Config->is_template($conf)) {
PVE::Storage::activate_volumes($storage_cfg, [ $new_volid ]);
my $template_volid = PVE::Storage::vdisk_create_base($storage_cfg, $new_volid);
@@ -1962,7 +1980,10 @@ __PACKAGE__->register_method({
$conf = PVE::LXC::Config->load_config($vmid);
PVE::Tools::assert_if_modified($digest, $conf->{digest});
- $conf->{$mpkey} = PVE::LXC::Config->print_ct_mountpoint($mpdata, $mpkey eq 'rootfs');
+ $conf->{$mpkey} = PVE::LXC::Config->print_ct_mountpoint(
+ $mpdata,
+ $mpkey eq 'rootfs'
+ );
PVE::LXC::Config->add_unused_volume($conf, $old_volid) if !$param->{delete};
--
2.30.2
prev parent reply other threads:[~2021-11-02 15:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 15:03 [pve-devel] [PATCH v4 storage qemu-server container 0/9] move disk or volume to other guests Aaron Lauterer
2021-11-02 15:03 ` [pve-devel] [PATCH v4 storage 1/9] storage: add new find_free_volname Aaron Lauterer
2021-11-08 15:21 ` Fabian Grünbichler
2021-11-08 15:53 ` Thomas Lamprecht
2021-11-09 14:42 ` Aaron Lauterer
2021-11-02 15:03 ` [pve-devel] [PATCH v4 storage 2/9] add disk rename feature Aaron Lauterer
2021-11-02 15:03 ` [pve-devel] [PATCH v4 qemu-server 3/9] cli: qm: change move_disk to move-disk Aaron Lauterer
2021-11-02 15:03 ` [pve-devel] [PATCH v4 qemu-server 4/9] Drive: add valid_drive_names_with_unused Aaron Lauterer
2021-11-02 15:03 ` [pve-devel] [PATCH v4 qemu-server 5/9] api: move-disk: add move to other VM Aaron Lauterer
2021-11-02 15:03 ` [pve-devel] [PATCH v4 qemu-server 6/9] api: move-disk: cleanup very long lines Aaron Lauterer
2021-11-02 15:03 ` [pve-devel] [PATCH v4 container 7/9] cli: pct: change move_volume to move-volume Aaron Lauterer
2021-11-02 15:03 ` [pve-devel] [PATCH v4 container 8/9] api: move-volume: add move to another container Aaron Lauterer
2021-11-02 16:44 ` Aaron Lauterer
2021-11-05 14:56 ` [pve-devel] [PATCH v4 container 8/9 (follow up)] " Aaron Lauterer
2021-11-02 15:03 ` Aaron Lauterer [this message]
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=20211102150335.2371545-10-a.lauterer@proxmox.com \
--to=a.lauterer@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