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

marsadm: fix faking new versionlink on join-resource

This commit is contained in:
Thomas Schoebel-Theuer 2014-01-16 07:01:06 +01:00
parent a3c429fdd1
commit 3b757354c3
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
userspace/marsadm
View File

@ -714,8 +714,7 @@ sub _fake_versionlink {
my $new_version = sprintf("$basedir/version-%09d-$host", $log_nr); my $new_version = sprintf("$basedir/version-%09d-$host", $log_nr);
my $pri_version = sprintf("$basedir/version-%09d-$primary", $log_nr); my $pri_version = sprintf("$basedir/version-%09d-$primary", $log_nr);
if ($primary eq $host) { if ($primary eq $host) {
lwarn "it makes no sense to fake my own version link '$new_version'\n"; ldie "Cannot fake my own version link '$new_version'\n";
return;
} }
my $pri_link = get_link($pri_version); my $pri_link = get_link($pri_version);
if (!$pri_link) { # try any one else if (!$pri_link) { # try any one else
@ -749,11 +748,7 @@ sub _set_replaylink {
set_link($rep_val, $rep_path); set_link($rep_val, $rep_path);
if ($log_nr > 1) { if ($log_nr > 1) {
my $old_primary = ""; _fake_versionlink($basedir, $log_nr - 1, $primary);
my $vers_link = sprintf("$basedir/version-%09d-$primary", $log_nr);
my $vers_val = get_link($vers_link);
$old_primary = $1 if $vers_val =~ m/:.*,log-[0-9]+-([^,]+),/;
_fake_versionlink($basedir, $log_nr - 1, $old_primary);
} else { } else {
my $initial; my $initial;
for (;;) { for (;;) {