RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marsadm: wait-cluster has-device waits for actual device appearance

This commit is contained in:
Thomas Schoebel-Theuer 2013-07-03 09:32:42 +02:00
parent 0f4cc33d15
commit e0d980223b
1 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
userspace/marsadm
View File

@ -190,15 +190,19 @@ sub sleep_timeout {
# wait for some condition # wait for some condition
sub wait_cond { sub wait_cond {
my ($cmd, $res, $specific) = @_; my ($cmd, $res, $specific) = @_;
my $is_actual = ($specific =~ s/^is-//); my $is_actual = ($specific =~ s/^(is|has)-//);
my $is_on = !($specific =~ s/-off$//); my $is_on = !($specific =~ s/-off$//);
$specific =~ s/-on$//; $specific =~ s/-on$//;
if ($is_actual) { if ($is_actual) {
if ($specific eq "device") {
check_mars_device($cmd, $res, 1, !$is_on);
return;
}
my %table = my %table =
( (
"attach" => "is-attached", "attach" => "is-attached",
"attached" => "is-attached",
"primary" => "is-primary", "primary" => "is-primary",
"device" => "device-$res",
); );
my $name = $table{$specific}; my $name = $table{$specific};
ldie "actual indicator '$specific' does not exist\n" unless exists($table{$specific}); ldie "actual indicator '$specific' does not exist\n" unless exists($table{$specific});
@ -207,6 +211,7 @@ sub wait_cond {
my %table = my %table =
( (
"attach" => "attach", "attach" => "attach",
"attached" => "attach",
"connect" => "connect", "connect" => "connect",
"replay" => "allow-replay", "replay" => "allow-replay",
"sync" => "sync", "sync" => "sync",
@ -216,6 +221,7 @@ sub wait_cond {
check_todo($cmd, $res, $name, $is_on ? 1 : 0, 1); check_todo($cmd, $res, $name, $is_on ? 1 : 0, 1);
} }
} }
# wait until some communication has occurred # wait until some communication has occurred
sub wait_cluster { sub wait_cluster {
return wait_cond(@_) if int(@_) >= 3; return wait_cond(@_) if int(@_) >= 3;
@ -406,6 +412,43 @@ sub check_status {
lprint "OK, '$path' has acceptable value '$link'\n"; lprint "OK, '$path' has acceptable value '$link'\n";
} }
sub check_mars_device {
my ($cmd, $res, $wait, $inv) = @_;
my $name = get_link("$mars/resource-$res/device-$host");
my $dev = "/dev/mars/$name";
my $backoff = 1;
my $round = 0;
if ($inv) {
while (-b $dev) {
ldie "cannot execute $cmd: device '$dev' has not yet disappeared\n" if !$wait;
lwarn "device '$dev' has not yet disappeared\n";
sleep_timeout($backoff);
# very slowly increasing backoff
if ($backoff < 10 && $round++ > 5) {
$round = 0;
$backoff++;
}
}
lprint "device '$dev' is no longer present\n" unless -b $dev;
return;
}
# !$inv
while (! -e $dev) {
my $text = get_error_text($cmd, $res);
lprint $text if $text;
ldie "aborting due to errors\n" if $text =~ m/error/mi;
ldie "cannot execute $cmd: device '$dev' not yet present\n" if !$wait;
lprint "device '$dev' not yet present\n";
sleep_timeout($backoff);
# very slowly increasing backoff
if ($backoff < 10 && $round++ > 5) {
$round = 0;
$backoff++;
}
}
lprint "device '$dev' is present\n" if -b $dev;
}
sub check_userspace { sub check_userspace {
my ($dst) = @_; my ($dst) = @_;
if ($dst !~ m:/userspace/:) { if ($dst !~ m:/userspace/:) {
@ -1125,13 +1168,7 @@ sub attach_res_phase2 {
my $detach = ($cmd eq "detach"); my $detach = ($cmd eq "detach");
check_status($cmd, $res, "is-attached", $detach ? 0 : 1, 1); check_status($cmd, $res, "is-attached", $detach ? 0 : 1, 1);
if ($detach) { if ($detach) {
my $name = get_link("$mars/resource-$res/device-$host"); check_mars_device($cmd, $res, 1, 1);
my $dev = "/dev/mars/$name";
while (-e $dev) {
lprint "device '$dev' not yet disappeared\n";
sleep_timeout(3);
}
lprint "OK, device '$dev' is not present\n";
} }
} }
@ -1312,36 +1349,11 @@ sub primary_phase3 {
sub primary_phase4 { sub primary_phase4 {
my ($cmd, $res) = @_; my ($cmd, $res) = @_;
return if $force; return if $force;
my $name = get_link("$mars/resource-$res/device-$host");
my $dev = "/dev/mars/$name";
my $backoff = 1;
my $round = 0;
if($cmd eq "secondary") { if($cmd eq "secondary") {
while (-b $dev) { check_mars_device($cmd, $res, 1, 1);
lwarn "device '$dev' has not yet disappeared\n";
sleep_timeout($backoff);
# very slowly increasing backoff
if ($backoff < 10 && $round++ > 5) {
$round = 0;
$backoff++;
}
}
lprint "device '$dev' is no longer present\n" unless -b $dev;
return; return;
} }
while (! -e $dev) { check_mars_device($cmd, $res, 1, 0);
my $text = get_error_text($cmd, $res);
lprint $text if $text;
ldie "aborting due to errors\n" if $text =~ m/error/mi;
lprint "device '$dev' not yet present\n";
sleep_timeout($backoff);
# very slowly increasing backoff
if ($backoff < 10 && $round++ > 5) {
$round = 0;
$backoff++;
}
}
lprint "device '$dev' is present\n" if -b $dev;
} }
sub wait_umount_res { sub wait_umount_res {