mirror of https://github.com/schoebel/mars
marsadm: fix view-wait-is-* when symlinks are not yet present
This commit is contained in:
parent
8bc1e80488
commit
c0d57bef7a
|
@ -306,7 +306,7 @@ sub wait_cond {
|
||||||
);
|
);
|
||||||
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});
|
||||||
check_status($cmd, $res, $name, $is_on ? 1 : 0, 1);
|
check_status($cmd, $res, $name, $is_on ? 1 : 0, 1, 1);
|
||||||
} else {
|
} else {
|
||||||
my %table =
|
my %table =
|
||||||
(
|
(
|
||||||
|
@ -487,7 +487,7 @@ sub check_sync_finished {
|
||||||
sub check_primary {
|
sub check_primary {
|
||||||
my ($cmd, $res) = @_;
|
my ($cmd, $res) = @_;
|
||||||
my $lnk = "$mars/resource-$res/actual-$host/is-primary";
|
my $lnk = "$mars/resource-$res/actual-$host/is-primary";
|
||||||
my $is_primary = get_link($lnk);
|
my $is_primary = get_link($lnk, 1);
|
||||||
if (!$is_primary) { # give it a second chance
|
if (!$is_primary) { # give it a second chance
|
||||||
my $name = get_link("$mars/resource-$res/device-$host", 1);
|
my $name = get_link("$mars/resource-$res/device-$host", 1);
|
||||||
my $dev = "/dev/mars/$name";
|
my $dev = "/dev/mars/$name";
|
||||||
|
@ -580,7 +580,7 @@ sub check_status {
|
||||||
my $link;
|
my $link;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
$link = get_link($path, $unchecked);
|
$link = get_link($path, $unchecked);
|
||||||
return unless defined($link);
|
$link = 0 unless (defined($link) && $link ne "");
|
||||||
if (defined($inv) && $inv) {
|
if (defined($inv) && $inv) {
|
||||||
last if $link != $val;
|
last if $link != $val;
|
||||||
lprint "$wait_msg actual '$key' != '$val'...\n";
|
lprint "$wait_msg actual '$key' != '$val'...\n";
|
||||||
|
|
Loading…
Reference in New Issue