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

marsadm: use systemctl --job-mode=fail

This commit is contained in:
Thomas Schoebel-Theuer 2020-12-25 07:13:44 +01:00
parent fe0b212ab6
commit 1a63045f3e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
userspace/marsadm
View File

@ -1038,7 +1038,14 @@ sub get_systemd_files {
sub systemctl {
my ($args, $verb) = @_;
$verb = $verbose unless defined($verb);
my $cmd = "$systemctl $args";
$args =~ m/^\w+\s*(.*)/;
my $rest = $1;
my $ord_cmd = "$systemctl $args";
my $cmd = $ord_cmd;
my $busy_cmd = ($args =~ m/^(start|stop)/);
if ($busy_cmd) {
$cmd = "$systemctl --job-mode=fail $args";
}
lprint "executing: '$cmd'\n" if $verb > 1;
my $nr_retry = 0;
my $status;
@ -1046,16 +1053,15 @@ sub systemctl {
eval {
$status = system($cmd);
};
if ($status && $args =~ m/^start (.*)/) {
my $rest = $1;
if ($status && $busy_cmd) {
lwarn "command '$cmd' failed with status=$status\n";
# linear backoff
$nr_retry++;
sleep($nr_retry);
if ($nr_retry <= 5) {
eval {
system("systemctl reset-failed $rest");
};
goto retry;
} elsif ($cmd ne $ord_cmd) {
$cmd = $ord_cmd;
goto retry;
}
}