btrfs: support newer prune-backups for backup retention

[pve-storage.git] / PVE / Diskmanage.pm

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 07bcef2c554cfb667bbbe4b7bc9722827fd99793..10e12184298051d670def31b610cacce83992fa8 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -22,7 +22,6 @@ my $LSBLK = "/bin/lsblk";
 
 sub check_bin {
     my ($path) = @_;
-
     return -x $path;
 }
 
@@ -252,7 +251,7 @@ sub get_lvm_devices {
     };
 
     # if something goes wrong, we do not want
-    # to give up, but indicate an error has occured
+    # to give up, but indicate an error has occurred
     warn "$@\n" if $@;
 
     my $uuids = {
@@ -795,7 +794,7 @@ sub get_blockdev {
     die "No valid block device\n" if index($dev, $block_dev) == -1;
 
     $block_dev = "/dev/$block_dev";
-    die "Block device does not exsists\n" if !(-b $block_dev);
+    die "Block device does not exists\n" if !(-b $block_dev);
 
     return $block_dev;
 }
@@ -837,7 +836,7 @@ sub append_partition {
 
     my $partition;
 
-    # loop again to detect the real partiton device which does not always follow
+    # loop again to detect the real partition device which does not always follow
     # a strict $devname$partition scheme like /dev/nvme0n1 -> /dev/nvme0n1p1
     dir_glob_foreach("/sys/block/$devname", qr/\Q$devname\E.*$newpartid/, sub {
        my ($part) = @_;
@@ -848,25 +847,26 @@ sub append_partition {
     return $partition;
 }
 
+my sub strip_dev :prototype($) {
+    my ($devpath) = @_;
+    $devpath =~ s|^/dev/||;
+    return $devpath;
+}
+
 # Check if a disk or any of its partitions has a holder.
 # Can also be called with a partition.
 # Expected to be called with a result of verify_blockdev_path().
 sub has_holder {
     my ($devpath) = @_;
 
-    my $sysdir = "/sys/class/block/";
-
-    my $dev = $devpath;
-    $dev =~ s|^/dev/||;
+    my $dev = strip_dev($devpath);
 
-    return $devpath if !dir_is_empty("${sysdir}/${dev}/holders");
+    return $devpath if !dir_is_empty("/sys/class/block/${dev}/holders");
 
     my $found;
-
     dir_glob_foreach("/sys/block/${dev}", "${dev}.+", sub {
        my ($part) = @_;
-
-       $found = "/dev/${part}" if !dir_is_empty("${sysdir}/${part}/holders");
+       $found = "/dev/${part}" if !dir_is_empty("/sys/class/block/${part}/holders");
     });
 
     return $found;
@@ -882,14 +882,11 @@ sub is_mounted {
 
     return $devpath if $mounted->{$devpath};
 
-    my $dev = $devpath;
-    $dev =~ s|^/dev/||;
+    my $dev = strip_dev($devpath);
 
     my $found;
-
     dir_glob_foreach("/sys/block/${dev}", "${dev}.+", sub {
        my ($part) = @_;
-
        my $partpath = "/dev/${part}";
 
        $found = $partpath if $mounted->{$partpath};
@@ -903,10 +900,6 @@ sub is_mounted {
 sub wipe_blockdev {
     my ($devpath) = @_;
 
-    my $wipefs_cmd = ['wipefs', '--all', $devpath];
-
-    my $dd_cmd = ['dd', 'if=/dev/zero', "of=${devpath}", 'bs=1M', 'conv=fdatasync'];
-
     my $devname = basename($devpath);
     my $dev_size = PVE::Tools::file_get_contents("/sys/class/block/$devname/size");
 
@@ -916,12 +909,25 @@ sub wipe_blockdev {
     my $size = ($dev_size * 512 / 1024 / 1024);
     my $count = ($size < 200) ? $size : 200;
 
-    push @{$dd_cmd}, "count=${count}";
+    my $to_wipe = [];
+    dir_glob_foreach("/sys/class/block/${devname}", "${devname}.+", sub {
+       my ($part) = @_;
+       push $to_wipe->@*, "/dev/${part}" if -b "/dev/${part}";
+    });
 
-    print "wiping disk/partition: ${devpath}\n";
+    if (scalar($to_wipe->@*) > 0) {
+       print "found child partitions to wipe: ". join(', ', $to_wipe->@*) ."\n";
+    }
+    push $to_wipe->@*, $devpath; # put actual device last
+
+    print "wiping block device ${devpath}\n";
 
-    run_command($wipefs_cmd, errmsg => "error wiping labels for '${devpath}'");
-    run_command($dd_cmd, errmsg => "error wiping '${devpath}'");
+    run_command(['wipefs', '--all', $to_wipe->@*], errmsg => "error wiping '${devpath}'");
+
+    run_command(
+       ['dd', 'if=/dev/zero', "of=${devpath}", 'bs=1M', 'conv=fdatasync', "count=${count}"],
+       errmsg => "error wiping '${devpath}'",
+    );
 }
 
 1;