RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-02-08 16:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

marsadm: continue work after leave-resource

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2017-09-09 23:03:02 +02:00 committed by Thomas Schoebel-Theuer
parent 58efb90f04
commit 495490f4b6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
userspace/marsadm
View File

@ -2153,6 +2153,7 @@ sub leave_res_phase0 {
sub leave_res_phase1 { sub leave_res_phase1 {
my ($cmd, $res) = @_; my ($cmd, $res) = @_;
set_link("1", "$mars/resource-$res/work-$host");
_create_delete("$mars/resource-$res/replay-$host"); _create_delete("$mars/resource-$res/replay-$host");
_create_delete("$mars/resource-$res/data-$host"); _create_delete("$mars/resource-$res/data-$host");
_create_delete("$mars/resource-$res/syncstatus-$host"); _create_delete("$mars/resource-$res/syncstatus-$host");
@ -2204,6 +2205,7 @@ sub delete_res {
next if $path =~ m:/(maxnr$|\.deleted-):; next if $path =~ m:/(maxnr$|\.deleted-):;
_create_delete($path); _create_delete($path);
} }
set_link("1", "$mars/resource-$res/work-$host");
finish_links(); finish_links();
_wait_delete(); _wait_delete();
} }
@ -2352,7 +2354,7 @@ sub logdelete_res {
my ($cmd, $res) = @_; my ($cmd, $res) = @_;
lprint "removing left-over .deleted symlinks...\n" if $verbose; lprint "removing left-over .deleted symlinks...\n" if $verbose;
my $start_time = mars_time(); my $start_time = mars_time();
foreach my $leftlink (glob("$mars/{,resource-$res/}{,*/}{.deleted,delete-}-*")) { foreach my $leftlink (glob("$mars/{,resource-$res/}{,*/}{.deleted,delete,work}-*")) {
my $stamp = get_link_stamp($leftlink); my $stamp = get_link_stamp($leftlink);
next unless $stamp + 3600 * 24 < $start_time; next unless $stamp + 3600 * 24 < $start_time;
lprint " unlink '$leftlink'\n" if $verbose; lprint " unlink '$leftlink'\n" if $verbose;