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

marsadm: safeguard return at attach

This commit is contained in:
Thomas Schoebel-Theuer 2020-12-08 21:10:16 +01:00
parent 2561800e68
commit dcb60eaef3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
userspace/marsadm
View File

@ -5339,7 +5339,7 @@ sub cron_phase2 {
sub attach_res_phase0 { sub attach_res_phase0 {
my ($cmd, $res) = @_; my ($cmd, $res) = @_;
return if $force; return 0 if $force;
my $detach = ($cmd eq "detach"); my $detach = ($cmd eq "detach");
if ($detach) { if ($detach) {
my $device_in_use = get_link("$mars/resource-$res/actual-$host/open-count", 1); my $device_in_use = get_link("$mars/resource-$res/actual-$host/open-count", 1);
@ -5352,21 +5352,23 @@ sub attach_res_phase0 {
_switch($cmd, $res, $path, 0); _switch($cmd, $res, $path, 0);
finish_links(); finish_links();
systemd_activate($cmd, $res, 0, 1); systemd_activate($cmd, $res, 0, 1);
return; return 0;
} }
my $dev = device_name($res); my $dev = device_name($res);
ldie "device '$dev' is in use\n"; ldie "device '$dev' is in use\n";
} }
} }
return 0;
} }
# only for systemd: wait that primary device is no longer open # only for systemd: wait that primary device is no longer open
sub attach_res_phase0b { sub attach_res_phase0b {
my ($cmd, $res) = @_; my ($cmd, $res) = @_;
return unless $cmd eq "detach"; return 0 unless $cmd eq "detach";
return unless systemd_present(@_); return 0 unless systemd_present(@_);
check_status($cmd, $res, "open-count", 0, 1); check_status($cmd, $res, "open-count", 0, 1);
wait_cluster($cmd); wait_cluster($cmd);
return 0;
} }
sub attach_res_phase1 { sub attach_res_phase1 {
@ -5374,15 +5376,16 @@ sub attach_res_phase1 {
my $detach = ($cmd eq "detach"); my $detach = ($cmd eq "detach");
my $path = "$mars/resource-$res/todo-$host/attach"; my $path = "$mars/resource-$res/todo-$host/attach";
_switch($cmd, $res, $path, !$detach); _switch($cmd, $res, $path, !$detach);
return 0;
} }
sub attach_res_phase2 { sub attach_res_phase2 {
my ($cmd, $res) = @_; my ($cmd, $res) = @_;
my $detach = ($cmd eq "detach"); my $detach = ($cmd eq "detach");
return if $force; return 0 if $force;
if (!is_module_loaded()) { if (!is_module_loaded()) {
lwarn "Kernel module not loaded: $cmd will become effective after modprobe\n"; lwarn "Kernel module not loaded: $cmd will become effective after modprobe\n";
return; return 0;
} }
check_status($cmd, $res, "is-attached", $detach ? 0 : 1, 1); check_status($cmd, $res, "is-attached", $detach ? 0 : 1, 1);
if ($detach) { if ($detach) {
@ -5392,6 +5395,7 @@ sub attach_res_phase2 {
check_status($cmd, $res, "is-syncing", 0, 1); check_status($cmd, $res, "is-syncing", 0, 1);
system("sync"); system("sync");
} }
return 0;
} }
sub fetch_global_res { sub fetch_global_res {