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

import mars-116.tgz

This commit is contained in:
Thomas Schoebel-Theuer 2011-07-11 15:01:28 +01:00
parent 64885b651e
commit ead69b3294
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mars_light.c
View File

@ -1519,7 +1519,9 @@ void _change_trans(struct mars_rotate *rot)
{
struct trans_logger_brick *trans_brick = rot->trans_brick;
if ((trans_brick->do_replay)) {
MARS_DBG("do_replay = %d start_pos = %lld end_pos = %lld\n", trans_brick->do_replay, rot->start_pos, rot->end_pos);
if (trans_brick->do_replay) {
trans_brick->replay_start_pos = rot->start_pos;
trans_brick->replay_end_pos = rot->end_pos;
} else {
@ -1678,7 +1680,7 @@ int make_log_finalize(struct mars_global *global, struct mars_dent *parent)
if (!trans_input) {
continue;
}
if (trans_input->replay_min_pos != trans_brick->replay_end_pos) {
if (trans_input->replay_min_pos < trans_brick->replay_end_pos) {
do_stop = false;
break;
}

2
userspace/marsadm
View File

@ -270,7 +270,7 @@ sub create_res {
}
die "sizes differ: real size = $oldsize, but requested size = $size\n" unless $oldsize == $size;
$replay = readlink("$tmp/replay-$primary") or die "cannot read replay status of primary '$primary'\n";
$replay =~ s/-$primary,/-$host,/ or die "something is wrong here\n";
$replay =~ s/-$primary,[0-9]+,[0-9]+/-$host,0,0/ or die "something is wrong here\n";
}
my $file = "$tmp/data-$host";