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

marsadm: fix join-cluster when the peer is actively running 

In such a case rsync may spill an error because some symlinks
were updated in the meantime or have vanished. We can safely
ignore that.
This commit is contained in:
Thomas Schoebel-Theuer 2016-01-25 10:36:05 +01:00 committed by Thomas Schoebel-Theuer
parent e36a2ea4f1
commit 7ff2d896ea
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
userspace/marsadm
View File

@ -1456,6 +1456,19 @@ sub create_cluster {
_create_cluster(@_);
}
sub _run_rsync {
my ($cmd) = @_;
my $cycle = 0;
my $status = 0;
# Repeat the action because some symlinks might be updated (or even vanish)
# when the peer is actively running. There seems to exist no rsync option
# for ignoring all of these errors.
do {
$status = system($cmd);
} while ($status != 0 && $status != 24 && $cycle++ < 3);
ldie "Cannot get remote symlink tree via rsync, status=$status\n" if ($status && $status != 24);
}
sub join_cluster {
my ($cmd, $peer) = @_;
ldie "Cannot join myself (peer='$peer', host='$host')\n" if $peer eq $host;
@ -1470,12 +1483,12 @@ sub join_cluster {
# check connection
system("ssh $peer uname -a") == 0 or ldie "oops, no connection to $peer ...\n";
unless ($dry_run) {
system("rsync --recursive --links --max-size=1 -v $peer:$mars/ $mars/") == 0 or ldie "cannot get remote symlink tree via rsync\n";
_run_rsync("rsync --recursive --links --max-size=1 -v $peer:$mars/ $mars/");
}
_create_cluster(@_);
finish_links();
unless ($dry_run) {
system("rsync --recursive --links -v $mars/ips/ $peer:$mars/ips/") == 0 or ldie "oops\n";
_run_rsync("rsync --recursive --links -v $mars/ips/ $peer:$mars/ips/");
}
}