[pve-devel] [PATCH storage v7 6/9] api: content: support copying backups between path based storages

[Filip Schauer <f.schauer@proxmox.com>]

This commit adds support for the "backup+meta" export format. When this
format is used, the notes and protection flag of the backup are included
in the metadata header.

Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
 src/PVE/API2/Storage/Content.pm | 10 ++++++++--
 src/PVE/Storage/Plugin.pm       | 21 ++++++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/PVE/API2/Storage/Content.pm b/src/PVE/API2/Storage/Content.pm
index 5996540..ff3c88d 100644
--- a/src/PVE/API2/Storage/Content.pm
+++ b/src/PVE/API2/Storage/Content.pm
@@ -498,7 +498,8 @@ __PACKAGE__->register_method ({
     permissions => {
 	description => "If the --delete option is used, the 'Datastore.Allocate' privilege is"
 	    ." required on the source storage."
-	    ." Without --delete, 'Datastore.AllocateSpace' is required on the target storage.",
+	    ." Without --delete, 'Datastore.AllocateSpace' is required on the target storage."
+	    ." When moving a backup, 'VM.Backup' is required on the VM or container.",
 	user => 'all',
     },
     protected => 1,
@@ -554,7 +555,7 @@ __PACKAGE__->register_method ({
 	my ($vtype, undef, $ownervm) = PVE::Storage::parse_volname($cfg, $src_volid);
 	die "use pct move-volume or qm disk move\n" if $vtype eq 'images' || $vtype eq 'rootdir';
 	die "moving volume of type '$vtype' not implemented\n"
-	    if !grep { $vtype eq $_ } qw(import iso snippets vztmpl);
+	    if !grep { $vtype eq $_ } qw(backup import iso snippets vztmpl);
 
 	my $rpcenv = PVE::RPCEnvironment::get();
 	my $user = $rpcenv->get_user();
@@ -563,6 +564,11 @@ __PACKAGE__->register_method ({
 
 	if ($delete) {
 	    $rpcenv->check($user, "/storage/$src_storeid", ["Datastore.Allocate"]);
+
+	    if ($vtype eq 'backup') {
+		my $protected = PVE::Storage::get_volume_attribute($cfg, $src_volid, 'protected');
+		die "cannot delete protected backup\n" if $protected;
+	    }
 	}
 
 	$rpcenv->check($user, "/storage/$dst_storeid", ["Datastore.AllocateSpace"]);
diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
index 34f26a3..dc370e9 100644
--- a/src/PVE/Storage/Plugin.pm
+++ b/src/PVE/Storage/Plugin.pm
@@ -1762,6 +1762,13 @@ sub volume_export {
 		format => $data_format,
 	    };
 
+	    if ($vtype eq 'backup') {
+		$meta->{protected} = $class->get_volume_attribute(
+		    $scfg, $storeid, $volname, 'protected') ? JSON::true : JSON::false;
+		$meta->{notes} = Encode::encode(
+		    'utf8', $class->get_volume_attribute($scfg, $storeid, $volname, 'notes')) // "";
+	    }
+
 	    write_meta_header($fh, $meta);
 	    write_common_header($fh, $size);
 	    if ($data_format =~ /^(raw|ova|ovf|qcow2|vmdk)$/) {
@@ -1798,6 +1805,7 @@ sub volume_export_formats {
 	    return ();
 	}
 	return ("$vtype+meta", 'tar+size') if $format eq 'subvol';
+	return ('backup+meta') if $vtype eq 'backup';
 	return ("$vtype+meta", 'raw+size') if $vtype =~ /^(iso|snippets|vztmpl|import)$/;
     }
     return ();
@@ -1877,7 +1885,7 @@ sub volume_import {
 	    warn $@ if $@;
 	    die $err;
 	}
-    } elsif (grep { $vtype eq $_ } qw(import iso snippets vztmpl)) {
+    } elsif (grep { $vtype eq $_ } qw(import iso snippets vztmpl backup)) {
 	eval {
 	    run_command(['dd', "of=$file", 'conv=excl', 'bs=64k'], input => '<&'.fileno($fh));
 	};
@@ -1888,6 +1896,16 @@ sub volume_import {
 	    }
 	    die $err;
 	}
+
+	if ($vtype eq 'backup' && defined($meta)) {
+	    if (defined($meta->{notes})) {
+		my $notes = Encode::decode('utf8', $meta->{notes});
+		$class->update_volume_attribute($scfg, $storeid, $volname, 'notes', $notes);
+	    }
+
+	    $class->update_volume_attribute($scfg, $storeid, $volname, 'protected', 1)
+		if $meta->{protected};
+	}
     } else {
 	die "importing volume of type '$vtype' not implemented\n";
     }
@@ -1905,6 +1923,7 @@ sub volume_import_formats {
 	    return ();
 	}
 	return ("$vtype+meta", 'tar+size') if $format eq 'subvol';
+	return ('backup+meta') if $vtype eq 'backup';
 	return ("$vtype+meta", 'raw+size') if $vtype =~ /^(iso|snippets|vztmpl|import)$/;
     }
     return ();
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel