yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DirPlugin: update_volume_attribute: don't use update_volume_notes

Browse Source 
by refactoring it into a helper and use that.
With this, we can omit the 'update_volume_notes' in subclasses

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2022-06-02 10:52:13 +02:00
committed by Wolfgang Bumiller
parent 22bef1f99a
commit 91d49d1d52
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
PVE/Storage/DirPlugin.pm
View File

@ -94,9 +94,8 @@ sub parse_is_mountpoint {
return $is_mp; # contains a path return $is_mp; # contains a path
} }
# FIXME remove on the next APIAGE reset. # FIXME move into 'get_volume_attribute' when removing 'get_volume_notes'
# Deprecated, use get_volume_attribute instead. my $get_volume_notes_impl = sub {
sub get_volume_notes {
my ($class, $scfg, $storeid, $volname, $timeout) = @_; my ($class, $scfg, $storeid, $volname, $timeout) = @_;
my ($vtype) = $class->parse_volname($volname); my ($vtype) = $class->parse_volname($volname);
@ -111,11 +110,17 @@ sub get_volume_notes {
} }
return ''; return '';
} };
# FIXME remove on the next APIAGE reset. # FIXME remove on the next APIAGE reset.
# Deprecated, use update_volume_attribute instead. # Deprecated, use get_volume_attribute instead.
sub update_volume_notes { sub get_volume_notes {
my ($class, $scfg, $storeid, $volname, $timeout) = @_;
return $get_volume_notes_impl->($class, $scfg, $storeid, $volname, $timeout);
}
# FIXME move into 'update_volume_attribute' when removing 'update_volume_notes'
my $update_volume_notes_impl = sub {
my ($class, $scfg, $storeid, $volname, $notes, $timeout) = @_; my ($class, $scfg, $storeid, $volname, $notes, $timeout) = @_;
my ($vtype) = $class->parse_volname($volname); my ($vtype) = $class->parse_volname($volname);
@ -131,13 +136,20 @@ sub update_volume_notes {
unlink $path or $! == ENOENT or die "could not delete notes - $!\n"; unlink $path or $! == ENOENT or die "could not delete notes - $!\n";
} }
return; return;
};
# FIXME remove on the next APIAGE reset.
# Deprecated, use update_volume_attribute instead.
sub update_volume_notes {
my ($class, $scfg, $storeid, $volname, $notes, $timeout) = @_;
return $update_volume_notes_impl->($class, $scfg, $storeid, $volname, $notes, $timeout);
} }
sub get_volume_attribute { sub get_volume_attribute {
my ($class, $scfg, $storeid, $volname, $attribute) = @_; my ($class, $scfg, $storeid, $volname, $attribute) = @_;
if ($attribute eq 'notes') { if ($attribute eq 'notes') {
return $class->get_volume_notes($scfg, $storeid, $volname); return $get_volume_notes_impl->($class, $scfg, $storeid, $volname);
} }
my ($vtype) = $class->parse_volname($volname); my ($vtype) = $class->parse_volname($volname);
@ -155,7 +167,7 @@ sub update_volume_attribute {
my ($class, $scfg, $storeid, $volname, $attribute, $value) = @_; my ($class, $scfg, $storeid, $volname, $attribute, $value) = @_;
if ($attribute eq 'notes') { if ($attribute eq 'notes') {
return $class->update_volume_notes($scfg, $storeid, $volname, $value); return $update_volume_notes_impl->($class, $scfg, $storeid, $volname, $value);
} }
my ($vtype) = $class->parse_volname($volname); my ($vtype) = $class->parse_volname($volname);