prune: allow having all prune options zero/missing

[pve-storage.git] / PVE / Storage / Plugin.pm

diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index 8a58ff4050ae516af4ffe708a196e8bf274a704a..fe56864cc177e512bbe3e50df2f688700cd708a3 100644 (file)
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -19,6 +19,8 @@ use base qw(PVE::SectionConfig);
 
 use constant COMPRESSOR_RE => 'gz|lzo|zst';
 
+use constant COMMENT_EXT => ".comment";
+
 our @COMMON_TAR_FLAGS = qw(
     --one-file-system
     -p --sparse --numeric-owner --acls
@@ -49,46 +51,38 @@ my %prune_option = (
     format_description => 'N',
 );
 
-my $prune_backups_format = {
-       'keep-last' => {
-           %prune_option,
-           description => 'Keep the last <N> backups.',
-       },
-       'keep-hourly' => {
-           %prune_option,
-           description => 'Keep backups for the last <N> different hours. If there is more' .
-                          'than one backup for a single hour, only the latest one is kept.'
-       },
-       'keep-daily' => {
-           %prune_option,
-           description => 'Keep backups for the last <N> different days. If there is more' .
-                          'than one backup for a single day, only the latest one is kept.'
-       },
-       'keep-weekly' => {
-           %prune_option,
-           description => 'Keep backups for the last <N> different weeks. If there is more' .
-                          'than one backup for a single week, only the latest one is kept.'
-       },
-       'keep-monthly' => {
-           %prune_option,
-           description => 'Keep backups for the last <N> different months. If there is more' .
-                          'than one backup for a single month, only the latest one is kept.'
-       },
-       'keep-yearly' => {
-           %prune_option,
-           description => 'Keep backups for the last <N> different years. If there is more' .
-                          'than one backup for a single year, only the latest one is kept.'
-       },
+our $prune_backups_format = {
+    'keep-last' => {
+       %prune_option,
+       description => 'Keep the last <N> backups.',
+    },
+    'keep-hourly' => {
+       %prune_option,
+       description => 'Keep backups for the last <N> different hours. If there is more' .
+                      'than one backup for a single hour, only the latest one is kept.'
+    },
+    'keep-daily' => {
+       %prune_option,
+       description => 'Keep backups for the last <N> different days. If there is more' .
+                      'than one backup for a single day, only the latest one is kept.'
+    },
+    'keep-weekly' => {
+       %prune_option,
+       description => 'Keep backups for the last <N> different weeks. If there is more' .
+                      'than one backup for a single week, only the latest one is kept.'
+    },
+    'keep-monthly' => {
+       %prune_option,
+       description => 'Keep backups for the last <N> different months. If there is more' .
+                      'than one backup for a single month, only the latest one is kept.'
+    },
+    'keep-yearly' => {
+       %prune_option,
+       description => 'Keep backups for the last <N> different years. If there is more' .
+                      'than one backup for a single year, only the latest one is kept.'
+    },
 };
-PVE::JSONSchema::register_format('prune-backups', $prune_backups_format, \&validate_prune_backups);
-sub validate_prune_backups {
-    my ($keep) = @_;
-
-    die "at least one keep-option must be set and positive\n"
-       if !grep { $_ } values %{$keep};
-
-    return $keep;
-}
+PVE::JSONSchema::register_format('prune-backups', $prune_backups_format);
 register_standard_option('prune-backups', {
     description => "The retention options with shorter intervals are processed first " .
                   "with --keep-last being the very first one. Each option covers a " .
@@ -783,6 +777,12 @@ sub file_size_info {
 
     my $st = File::stat::stat($filename);
 
+    if (!defined($st)) {
+       my $extramsg = -l $filename ? ' - dangling symlink?' : '';
+       warn "failed to stat '$filename'$extramsg\n";
+       return undef;
+    }
+
     if (S_ISDIR($st->mode)) {
        return wantarray ? (0, 'subvol', 0, undef, $st->ctime) : 1;
     }
@@ -882,6 +882,10 @@ sub volume_snapshot_delete {
     return undef;
 }
 
+sub volume_snapshot_needs_fsfreeze {
+
+    return 0;
+}
 sub storage_can_replicate {
     my ($class, $scfg, $storeid, $format) = @_;
 
@@ -978,7 +982,6 @@ my $get_subdir_files = sub {
     my $res = [];
 
     foreach my $fn (<$path/*>) {
-
        my $st = File::stat::stat($fn);
 
        next if (!$st || S_ISDIR($st->mode));
@@ -998,6 +1001,7 @@ my $get_subdir_files = sub {
        } elsif ($tt eq 'backup') {
            next if defined($vmid) && $fn !~  m/\S+-$vmid-\S+/;
            next if $fn !~ m!/([^/]+\.(tgz|(?:(?:tar|vma)(?:\.(${\COMPRESSOR_RE}))?)))$!;
+           my $original = $fn;
            my $format = $2;
            $fn = $1;
            $info = { volid => "$sid:backup/$fn", format => $format };
@@ -1010,6 +1014,12 @@ my $get_subdir_files = sub {
                $info->{vmid} = $vmid // $1;
            }
 
+           my $comment_fn = $original.COMMENT_EXT;
+           if (-f $comment_fn) {
+               my $comment = PVE::Tools::file_read_firstline($comment_fn);
+               $info->{comment} = $comment if defined($comment);
+           }
+
        } elsif ($tt eq 'snippets') {
 
            $info = {