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

drbd: remov hack, because bug is fixed upstream

Browse Source 
see http://git.drbd.org/gitweb.cgi?p=drbdmanage.git;a=commitdiff;h=8056e58b929673afb2d4a33d82fdeea4d43f8667
This commit is contained in:
Dietmar Maurer
2015-06-18 11:55:56 +02:00
parent 31ba75ff58
commit b0e0ed1abe
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
PVE/Storage/DRBDPlugin.pm
View File

@ -187,24 +187,6 @@ sub alloc_image {
($rc, $res) = $hdl->create_volume($name, $size, {}); ($rc, $res) = $hdl->create_volume($name, $size, {});
check_drbd_res($rc); check_drbd_res($rc);
my $redundancy = get_redundancy($scfg);;
($rc, $res) = $hdl->auto_deploy($name, $redundancy, 0, 0);
check_drbd_res($rc);
# hack: this is required to avoid bugs with set_drbdsetup_props(),
# which can result in a split brain if we do not wait.
# Note: wait until all volumes have cstate:deploy
my $max_wait = 15;
for (my $i = 0; $i < $max_wait; $i++) {
($rc, $res) = $hdl->list_assignments([], [$name], 0, { "cstate:deploy" => "true" }, []);
check_drbd_res($rc);
my $len = scalar(@$res);
last if $len == $redundancy;
sleep(1);
}
sleep(1); # another sleep - it does not work without -no idea why?
($rc, $res) = $hdl->set_drbdsetup_props( ($rc, $res) = $hdl->set_drbdsetup_props(
{ {
target => "resource", target => "resource",
@ -214,6 +196,11 @@ sub alloc_image {
}); });
check_drbd_res($rc); check_drbd_res($rc);
my $redundancy = get_redundancy($scfg);;
($rc, $res) = $hdl->auto_deploy($name, $redundancy, 0, 0);
check_drbd_res($rc);
return $name; return $name;
} }