thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ISA-L version EC recovery with first missing data chunk not being read

Browse Source 
(Yes, all EC n + k with k >= 2 users should upgrade as soon as possible)
This commit is contained in:
Vitaliy Filippov
2023-11-04 01:34:18 +03:00
parent becf14a705
commit 30dff8893f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/osd_rmw.cpp
+4 -3
View File
@@ -239,8 +239,9 @@ static void* get_jerasure_decoding_matrix(osd_rmw_stripe_t *stripes, int pg_size
{ {
int edd = 0; int edd = 0;
int erased[pg_size]; int erased[pg_size];
// we should distinguish stripes which are not at all and missing stripes
for (int i = 0; i < pg_size; i++) for (int i = 0; i < pg_size; i++)
erased[i] = (stripes[i].read_end == 0 || stripes[i].missing ? 1 : 0); erased[i] = (stripes[i].read_end == 0 ? 2 : (stripes[i].missing ? 1 : 0));
for (int i = 0; i < pg_minsize; i++) for (int i = 0; i < pg_minsize; i++)
if (stripes[i].read_end != 0 && stripes[i].missing) if (stripes[i].read_end != 0 && stripes[i].missing)
edd++; edd++;
@@ -253,7 +254,7 @@ static void* get_jerasure_decoding_matrix(osd_rmw_stripe_t *stripes, int pg_size
#ifdef WITH_ISAL #ifdef WITH_ISAL
int smrow = 0; int smrow = 0;
uint8_t *submatrix = (uint8_t*)malloc_or_die(pg_minsize*pg_minsize*2); uint8_t *submatrix = (uint8_t*)malloc_or_die(pg_minsize*pg_minsize*2);
for (int i = 0; i < pg_size; i++) for (int i = 0; i < pg_size && smrow < pg_minsize; i++)
{ {
if (!erased[i]) if (!erased[i])
{ {
@@ -279,7 +280,7 @@ static void* get_jerasure_decoding_matrix(osd_rmw_stripe_t *stripes, int pg_size
smrow = 0; smrow = 0;
for (int i = 0; i < pg_minsize; i++) for (int i = 0; i < pg_minsize; i++)
{ {
if (erased[i]) if (erased[i] == 1)
{ {
memcpy(submatrix + pg_minsize*smrow, submatrix + (pg_minsize+i)*pg_minsize, pg_minsize); memcpy(submatrix + pg_minsize*smrow, submatrix + (pg_minsize+i)*pg_minsize, pg_minsize);
smrow++; smrow++;