RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-02-19 05:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

marsadm: make check_primary_gone() more rubust

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2020-04-02 14:51:04 +02:00 committed by Thomas Schoebel-Theuer
parent 1c5416b6fc
commit 24f4051b53
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
userspace/marsadm
View File

@ -1702,14 +1702,20 @@ sub check_not_primary {
}
sub check_primary_gone {
my ($res) = @_;
my ($cmd, $res, $peer) = @_;
return 0 unless (defined($peer) && $peer && $peer ne "(none)");
return 0 if $peer eq $host;
for (;;) {
my $pri = _get_actual_primary($res);
last if !$pri;
last if $pri eq $host;
lprint "waiting for other primary host ($pri) to disappear....\n";
my $lnk = "$mars/resource-$res/actual-$peer/is-primary";
my $is_primary = get_link($lnk, 1);
if (defined($is_primary) && $is_primary eq "0") {
lprint "OK, other host ($peer) is not actual primary.\n";
return 0;
}
lprint "waiting for other primary host ($peer) to disappear....\n";
sleep_timeout();
}
return 1;
}
sub _make_messages {
@ -4093,8 +4099,12 @@ sub primary_phase1 {
my $phase2_waited = 0;
sub primary_phase1b {
my ($cmd, $res) = @_;
$phase2_waited = 0;
finish_links();
return if $force;
my $old = _get_designated_primary($res, -1);
return check_primary_gone($cmd, $res, $old);
}
# when necessary, wait
@ -4103,9 +4113,9 @@ sub primary_phase2 {
return if $force;
return unless $cmd eq "primary";
wait_cluster($cmd) if !$phase2_waited++;
check_primary_gone($res);
my $old = _get_designated_primary($res, -1);
check_primary_gone($cmd, $res, $old);
if (systemd_present(@_)) {
my $old = _get_designated_primary($res, -1);
try_to_avoid_splitbrain($cmd, $res, $old);
}
}