Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

raid6check.c: lock the stripe until necessary 

The stripe locking mechanism must be atomic between
the check and the, potential, autorepair.
For this reason, the autorepair code needs to be just
after the check and both parts (check and autorepair)
must be excuted under stripe lock.
Of course, the manual repair can operate as before.
This patch reorganize the code and provides the single,
atomic, stripe lock.
It should be confirmed that this new locking is not
too demanding.
In case it is, some other solutions will be required
(suggestions wellcome).

Signed off: piergiorgio.sartor@nexgo.de

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Piergiorgio Sartor 2014-03-15 16:37:52 +01:00 committed by NeilBrown
parent 303a263544
commit 3cfd0297a1
1 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
raid6check.c
View File

@ -211,9 +211,6 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
goto exitCheck;
}
}
err = unlock_all_stripes(info, sig);
if(err != 0)
goto exitCheck;
for (i = 0 ; i < data_disks ; i++) {
int disk = geo_map(i, start, raid_disks, level, layout);
@ -245,6 +242,64 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
}
}
if(repair == AUTO_REPAIR) {
int pages_to_write_count = 0;
int page_to_write[chunk_size >> CHECK_PAGE_BITS];
for(j = 0; j < (chunk_size >> CHECK_PAGE_BITS); j++) {
if (disk[j] >= 0) {
printf("Auto-repairing slot %d (%s)\n", disk[j], name[disk[j]]);
pages_to_write_count++;
page_to_write[j] = 1;
for(i = 0; i < raid_disks; i++) {
blocks_page[i] = blocks[i] + j * CHECK_PAGE_SIZE;
}
if (disk[j] == diskQ) {
qsyndrome(p, (uint8_t*)stripes[diskQ] + j * CHECK_PAGE_SIZE, (uint8_t**)blocks_page, data_disks, CHECK_PAGE_SIZE);
}
else {
char *all_but_failed_blocks[data_disks];
int failed_block_index = block_index_for_slot[disk[j]];
for (i = 0; i < data_disks; i++) {
if (failed_block_index == i) {
all_but_failed_blocks[i] = stripes[diskP] + j * CHECK_PAGE_SIZE;
}
else {
all_but_failed_blocks[i] = blocks_page[i];
}
}
xor_blocks(stripes[disk[j]] + j * CHECK_PAGE_SIZE,
all_but_failed_blocks, data_disks, CHECK_PAGE_SIZE);
}
}
else {
page_to_write[j] = 0;
}
}
if(pages_to_write_count > 0) {
int write_res = 0;
for(j = 0; j < (chunk_size >> CHECK_PAGE_BITS); j++) {
if(page_to_write[j] == 1) {
lseek64(source[disk[j]], offsets[disk[j]] + start * chunk_size + j * CHECK_PAGE_SIZE, SEEK_SET);
write_res += write(source[disk[j]], stripes[disk[j]] + j * CHECK_PAGE_SIZE, CHECK_PAGE_SIZE);
}
}
if (write_res != (CHECK_PAGE_SIZE * pages_to_write_count)) {
fprintf(stderr, "Failed to write a full chunk.\n");
unlock_all_stripes(info, sig);
err = -1;
goto exitCheck;
}
}
}
err = unlock_all_stripes(info, sig);
if(err != 0) {
goto exitCheck;
}
if(repair == MANUAL_REPAIR) {
printf("Repairing stripe %llu\n", start);
printf("Assuming slots %d (%s) and %d (%s) are incorrect\n",
@ -335,61 +390,6 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
}
int pages_to_write_count = 0;
int page_to_write[chunk_size >> CHECK_PAGE_BITS];
for(j = 0; j < (chunk_size >> CHECK_PAGE_BITS); j++) {
if (disk[j] >= 0 && repair == AUTO_REPAIR) {
printf("Auto-repairing slot %d (%s)\n", disk[j], name[disk[j]]);
pages_to_write_count++;
page_to_write[j] = 1;
for(i = 0; i < raid_disks; i++) {
blocks_page[i] = blocks[i] + j * CHECK_PAGE_SIZE;
}
if (disk[j] == diskQ) {
qsyndrome(p, (uint8_t*)stripes[diskQ] + j * CHECK_PAGE_SIZE, (uint8_t**)blocks_page, data_disks, CHECK_PAGE_SIZE);
} else {
char *all_but_failed_blocks[data_disks];
int failed_block_index = block_index_for_slot[disk[j]];
for (i=0; i < data_disks; i++)
if (failed_block_index == i)
all_but_failed_blocks[i] = stripes[diskP] + j * CHECK_PAGE_SIZE;
else
all_but_failed_blocks[i] = blocks_page[i];
xor_blocks(stripes[disk[j]] + j * CHECK_PAGE_SIZE,
all_but_failed_blocks, data_disks, CHECK_PAGE_SIZE);
}
} else {
page_to_write[j] = 0;
}
}
if(pages_to_write_count > 0) {
err = lock_stripe(info, start, chunk_size, data_disks, sig);
if(err != 0) {
if (err != 2)
unlock_all_stripes(info, sig);
goto exitCheck;
}
int write_res = 0;
for(j = 0; j < (chunk_size >> CHECK_PAGE_BITS); j++) {
if(page_to_write[j] == 1) {
lseek64(source[disk[j]], offsets[disk[j]] + start * chunk_size + j * CHECK_PAGE_SIZE, 0);
write_res += write(source[disk[j]], stripes[disk[j]] + j * CHECK_PAGE_SIZE, CHECK_PAGE_SIZE);
}
}
err = unlock_all_stripes(info, sig);
if (err != 0 || write_res != (CHECK_PAGE_SIZE * pages_to_write_count))
goto exitCheck;
if (write_res != (CHECK_PAGE_SIZE * pages_to_write_count)) {
fprintf(stderr, "Failed to write a full chunk.\n");
goto exitCheck;
}
}
length--;
start++;
}