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

marsadm: new command delete-file

This commit is contained in:
Thomas Schoebel-Theuer 2013-05-14 11:32:17 +02:00
parent 3f6d1d8858
commit fc0e6baa01
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
userspace/marsadm
View File

@ -376,6 +376,14 @@ sub check_status {
lprint "OK, '$path' has acceptable value '$link'\n";
}
sub check_userspace {
my ($dst) = @_;
if ($dst !~ m:/userspace/:) {
ldie "your path '$dst' must be inside $mars/userspace/ or $mars/resource-*/userspace/\n" unless $force;
lwarn "your path '$dst' is outside $mars/userspace/ or $mars/resource-*/userspace/ and you gave --force, hopefully YOU KNOW WHAT YOU ARE DOING\n";
}
}
##################################################################
# state inspection routines
@ -968,6 +976,7 @@ my $delete_nr = -1;
sub _create_delete {
my ($target) = @_;
ldie "cannot delete: '$target' is no absolute path\n" unless $target =~ m:^/:;
if ($delete_nr < 0) { # compute only upon first call
my @paths = glob("$mars/todo-global/delete-*");
foreach my $path (@paths) {
@ -990,6 +999,14 @@ sub _create_delete {
set_link($target, $new);
}
sub delete_file_cmd {
my $cmd = shift;
foreach my $path (@_) {
check_userspace($path);
_create_delete($path);
}
}
sub logdelete_res {
my ($cmd, $res) = @_;
my @paths = glob("$mars/resource-$res/log-*") or ldie "cannot find any logfiles\n";
@ -1511,6 +1528,7 @@ my %cmd_table =
"log-delete" => \&logdelete_res,
"log-delete-all" => \&logdelete_res,
"fake-sync" => \&fake_local_res,
"delete-file" => \&delete_file_cmd,
"cat" => \&cat_cmd,
"show" => \&show_cmd,
"show-errors" => \&show_errors_cmd,
@ -1632,7 +1650,7 @@ if (!(-d $mars) && $cmd !~ m/(create|join)-cluster|cat/) {
my $res = "";
if ($cmd eq "show") {
$res = shift @args;
} elsif (!($cmd =~ m/^(create|leave|wait)-cluster|cat$/)) {
} elsif (!($cmd =~ m/^(create|leave|wait)-cluster|cat|[a-z]+-file$/)) {
$res = shift @args || helplist "resource argument is missing\n";
check_id($res);
}
@ -1644,8 +1662,8 @@ sub do_one_res {
my $func = shift;
my ($cmd, $res) = @_;
$res = check_res($res) unless $cmd =~ m/^(join|create|leave|wait)-cluster|create-resource|show|cat$/;
check_res_member($res) unless $cmd =~ m/^(join|create)-(cluster|resource)|(leave|wait)-cluster|show|cat$/;
$res = check_res($res) unless $cmd =~ m/^(join|create|leave|wait)-cluster|create-resource|show|cat|[a-z]+-file$/;
check_res_member($res) unless $cmd =~ m/^(join|create)-(cluster|resource)|(leave|wait)-cluster|show|cat|[a-z]+-file$/;
&{$func}(@_);
}