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

DRBDPlugin: correctly use default redundancy

Browse Source
This commit is contained in:
Dietmar Maurer
2015-03-23 09:38:39 +01:00
parent d26e1891ff
commit fb0e1d93a7
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
PVE/Storage/DRBDPlugin.pm
View File

@ -14,6 +14,8 @@ use base qw(PVE::Storage::Plugin);
# Configuration # Configuration
my $default_redundancy = 2;
sub type { sub type {
return 'drbd'; return 'drbd';
} }
@ -31,7 +33,7 @@ sub properties {
type => 'integer', type => 'integer',
minimum => 1, minimum => 1,
maximum => 16, maximum => 16,
default => 2, default => $default_redundancy,
}, },
}; };
} }
@ -46,6 +48,12 @@ sub options {
# helper # helper
sub get_redundancy {
my ($scfg) = @_;
return $scfg->{redundancy} || $default_redundancy;
}
sub connect_drbdmanage_service { sub connect_drbdmanage_service {
my $bus = Net::DBus->system; my $bus = Net::DBus->system;
@ -174,7 +182,9 @@ sub alloc_image {
($rc, $res) = $hdl->create_volume($name, $size, {}); ($rc, $res) = $hdl->create_volume($name, $size, {});
check_drbd_rc($rc->[0]); check_drbd_rc($rc->[0]);
($rc, $res) = $hdl->auto_deploy($name, $scfg->{redundancy}, 0, 0); my $redundancy = get_redundancy($scfg);;
($rc, $res) = $hdl->auto_deploy($name, $redundancy, 0, 0);
check_drbd_rc($rc->[0]); check_drbd_rc($rc->[0]);
return $name; return $name;
@ -230,7 +240,8 @@ sub status {
eval { eval {
my $hdl = connect_drbdmanage_service(); my $hdl = connect_drbdmanage_service();
my ($rc, $res) = $hdl->cluster_free_query($scfg->{redundancy}); my $redundancy = get_redundancy($scfg);;
my ($rc, $res) = $hdl->cluster_free_query($redundancy);
check_drbd_rc($rc->[0]); check_drbd_rc($rc->[0]);
$avail = $res; $avail = $res;