prefer storage_check_enabled over storage_check_node

storage_check_enabled simply checks for the 'disable' option and then calls
storage_check_node.

While not strictly necessary for a second call where only the storage differs,
it is more future-proof: if support for a target storage is added at some point,
it might be easy to miss adapting the call.

For the migration checks, disabled storages are now always caught.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 0d4d91a24c29d163991aa4e187d529eb0e4a13db..b929481e3a0847b46d045388fc43142fa4896c9e 100644 (file)
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -275,7 +275,7 @@ __PACKAGE__->register_method({
        my $check_and_activate_storage = sub {
            my ($sid) = @_;
 
-           my $scfg = PVE::Storage::storage_check_node($storage_cfg, $sid, $node);
+           my $scfg = PVE::Storage::storage_check_enabled($storage_cfg, $sid, $node);
 
            raise_param_exc({ storage => "storage '$sid' does not support container directories"})
                if !$scfg->{content}->{rootdir};
@@ -1378,7 +1378,7 @@ __PACKAGE__->register_method({
            PVE::Storage::storage_check_enabled($storecfg, $storage);
            if ($target) {
                # check if storage is available on target node
-               PVE::Storage::storage_check_node($storecfg, $storage, $target);
+               PVE::Storage::storage_check_enabled($storecfg, $storage, $target);
                # clone only works if target storage is shared
                my $scfg = PVE::Storage::storage_config($storecfg, $storage);
                die "can't clone to non-shared storage '$storage'\n" if !$scfg->{shared};

diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
index b5917e9a7060d5a0ed378437f8cf3112e44e521d..95c5799ad2d070789e60d7d6d5003d0a0338ad1a 100644 (file)
--- a/src/PVE/LXC/Migrate.pm
+++ b/src/PVE/LXC/Migrate.pm
@@ -63,8 +63,8 @@ sub prepare {
        die "can't determine assigned storage for mount point '$ms'\n" if !$storage;
 
        # check if storage is available on both nodes
-       my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $storage);
-       PVE::Storage::storage_check_node($self->{storecfg}, $storage, $self->{node});
+       my $scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $storage);
+       PVE::Storage::storage_check_enabled($self->{storecfg}, $storage, $self->{node});
 
 
        if ($scfg->{shared}) {
@@ -134,8 +134,8 @@ sub phase1 {
        my ($sid, $volname) = PVE::Storage::parse_volume_id($volid);
 
        # check if storage is available on both nodes
-       my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $sid);
-       PVE::Storage::storage_check_node($self->{storecfg}, $sid, $self->{node});
+       my $scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $sid);
+       PVE::Storage::storage_check_enabled($self->{storecfg}, $sid, $self->{node});
 
        if ($scfg->{shared}) {
            $self->log('info', "volume '$volid' is on shared storage '$sid'")
@@ -192,7 +192,7 @@ sub phase1 {
        next if @{$dl->{$storeid}} == 0;
 
        # check if storage is available on target node
-       PVE::Storage::storage_check_node($self->{storecfg}, $storeid, $self->{node});
+       PVE::Storage::storage_check_enabled($self->{storecfg}, $storeid, $self->{node});
 
        PVE::Storage::foreach_volid($dl, sub {
            my ($volid, $sid, $volname) = @_;