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

drbd: correctly wait for diskless assignments

Browse Source
This commit is contained in:
Dietmar Maurer
2015-06-18 06:27:19 +02:00
parent d1e7ac11de
commit 4959ea20c1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/Storage/DRBDPlugin.pm
View File

@ -315,12 +315,14 @@ sub activate_volume {
($rc, $res) = $hdl->assign($nodename, $volname, { diskless => 'true' }); ($rc, $res) = $hdl->assign($nodename, $volname, { diskless => 'true' });
check_drbd_rc($rc->[0]); check_drbd_rc($rc->[0]);
# fixme: wait until device is acessible - looks strange to me ? # wait until device is acessitble
my $print_warning = 1; my $print_warning = 1;
my $max_wait_time = 20; my $max_wait_time = 20;
for (my $i = 0;; $i++) { for (my $i = 0;; $i++) {
last if system("dd if=$path of=/dev/null bs=512 count=1 >/dev/null 2>&1") == 0; ($rc, $res) = $hdl->list_assignments([$nodename], [$volname], 0, { "cstate:deploy" => "true" }, []);
check_drbd_rc($rc->[0]);
my $len = scalar(@$res);
last if $len > 0;
die "aborting wait - device '$path' still not readable\n" if $i > $max_wait_time; die "aborting wait - device '$path' still not readable\n" if $i > $max_wait_time;
print "waiting for device '$path' to become ready...\n" if $print_warning; print "waiting for device '$path' to become ready...\n" if $print_warning;
$print_warning = 0; $print_warning = 0;