rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use a single scheduling point for sync

Browse source
This commit is contained in:
Andrea Mazzoleni 2016-01-31 18:55:09 +01:00
parent d2bad33af8
commit 541665db46
3 changed files with 56 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cmdline/sync.c
View file

@ -686,6 +686,8 @@ static int state_sync_process(struct snapraid_state* state, struct snapraid_pari
unsigned l;
unsigned* waiting_map;
unsigned waiting_mac;
block_off_t blocknext;
void** buffernext;
/* the sync process assumes that all the hashes are correct */
/* including the ones from CHG and DELETED blocks */
@ -754,6 +756,10 @@ static int state_sync_process(struct snapraid_state* state, struct snapraid_pari
if (!state_progress_begin(state, blockstart, blockmax, countmax))
goto end;
/* scheduling helper */
buffernext = 0;
blocknext = 0;
while (1) {
unsigned failed_count;
int error_on_this_block;
@ -768,7 +774,14 @@ static int state_sync_process(struct snapraid_state* state, struct snapraid_pari
int writer_error[IO_WRITER_ERROR_MAX];
/* go to the next block */
blockcur = io_read_next(&io, &buffer);
if (buffernext != 0) {
/* if already computed, use it */
buffer = buffernext;
blockcur = blocknext;
} else {
/* otherwise do it now */
blockcur = io_read_next(&io, &buffer);
}
if (blockcur >= blockmax)
break;
@ -1227,7 +1240,7 @@ static int state_sync_process(struct snapraid_state* state, struct snapraid_pari
}
/* write finished */
io_write_next(&io, blockcur, !parity_going_to_be_updated, writer_error);
blocknext = io_write_and_read_next(&io, blockcur, !parity_going_to_be_updated, writer_error, &buffernext);
/* handle errors reported */
for (j = 0; j < IO_WRITER_ERROR_MAX; ++j) {