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

api/config: fix indentation

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2020-11-11 09:35:53 +01:00
parent 790ca37e69
commit 8ff8e27713
1 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
PVE/API2/Storage/Config.pm
View File

@ -161,35 +161,33 @@ __PACKAGE__->register_method ({
my $plugin = PVE::Storage::Plugin->lookup($type); my $plugin = PVE::Storage::Plugin->lookup($type);
my $opts = $plugin->check_config($storeid, $param, 1, 1); my $opts = $plugin->check_config($storeid, $param, 1, 1);
PVE::Storage::lock_storage_config( PVE::Storage::lock_storage_config(sub {
sub { my $cfg = PVE::Storage::config();
my $cfg = PVE::Storage::config(); if (my $scfg = PVE::Storage::storage_config($cfg, $storeid, 1)) {
die "storage ID '$storeid' already defined\n";
}
if (my $scfg = PVE::Storage::storage_config($cfg, $storeid, 1)) { $cfg->{ids}->{$storeid} = $opts;
die "storage ID '$storeid' already defined\n";
$plugin->on_add_hook($storeid, $opts, %$sensitive);
eval {
# try to activate if enabled on local node,
# we only do this to detect errors/problems sooner
if (PVE::Storage::storage_check_enabled($cfg, $storeid, undef, 1)) {
PVE::Storage::activate_storage($cfg, $storeid);
} }
};
if (my $err = $@) {
eval { $plugin->on_delete_hook($storeid, $opts) };
warn "$@\n" if $@;
die $err;
}
$cfg->{ids}->{$storeid} = $opts; PVE::Storage::write_config($cfg);
$plugin->on_add_hook($storeid, $opts, %$sensitive); }, "create storage failed");
eval {
# try to activate if enabled on local node,
# we only do this to detect errors/problems sooner
if (PVE::Storage::storage_check_enabled($cfg, $storeid, undef, 1)) {
PVE::Storage::activate_storage($cfg, $storeid);
}
};
if (my $err = $@) {
eval { $plugin->on_delete_hook($storeid, $opts) };
warn "$@\n" if $@;
die $err;
}
PVE::Storage::write_config($cfg);
}, "create storage failed");
return undef; return undef;
}}); }});
@ -217,7 +215,6 @@ __PACKAGE__->register_method ({
} }
PVE::Storage::lock_storage_config(sub { PVE::Storage::lock_storage_config(sub {
my $cfg = PVE::Storage::config(); my $cfg = PVE::Storage::config();
PVE::SectionConfig::assert_if_modified($cfg, $digest); PVE::SectionConfig::assert_if_modified($cfg, $digest);
@ -279,25 +276,23 @@ __PACKAGE__->register_method ({
my $storeid = extract_param($param, 'storage'); my $storeid = extract_param($param, 'storage');
PVE::Storage::lock_storage_config( PVE::Storage::lock_storage_config(sub {
sub { my $cfg = PVE::Storage::config();
my $cfg = PVE::Storage::config(); my $scfg = PVE::Storage::storage_config($cfg, $storeid);
my $scfg = PVE::Storage::storage_config($cfg, $storeid); die "can't remove storage - storage is used as base of another storage\n"
if PVE::Storage::storage_is_used($cfg, $storeid);
die "can't remove storage - storage is used as base of another storage\n" my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
if PVE::Storage::storage_is_used($cfg, $storeid);
my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); $plugin->on_delete_hook($storeid, $scfg);
$plugin->on_delete_hook($storeid, $scfg); delete $cfg->{ids}->{$storeid};
delete $cfg->{ids}->{$storeid}; PVE::Storage::write_config($cfg);
PVE::Storage::write_config($cfg); }, "delete storage failed");
}, "delete storage failed");
PVE::AccessControl::remove_storage_access($storeid); PVE::AccessControl::remove_storage_access($storeid);