gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for receiving old blobs and nulling the window with coding

Browse Source
This commit is contained in:
Stephen Akridge
2018-06-05 12:21:29 -07:00
committed by Greg Fitzgerald
parent e28ad2177e
commit f511ac9be7
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/erasure.rs
View File

@ -4,8 +4,8 @@ use packet::{BlobRecycler, SharedBlob, BLOB_HEADER_SIZE};
use std::result; use std::result;
//TODO(sakridge) pick these values //TODO(sakridge) pick these values
const NUM_CODED: usize = 20; pub const NUM_CODED: usize = 20;
const MAX_MISSING: usize = 4; pub const MAX_MISSING: usize = 4;
const NUM_DATA: usize = NUM_CODED - MAX_MISSING; const NUM_DATA: usize = NUM_CODED - MAX_MISSING;
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
@ -315,11 +315,12 @@ pub fn recover(
} }
} }
} }
if (data_missing + coded_missing) != NUM_CODED { if (data_missing + coded_missing) != NUM_CODED && (data_missing + coded_missing) != 0 {
trace!("recovering: data: {} coding: {}", data_missing, coded_missing); debug!("1: start: {} recovering: data: {} coding: {}", block_start, data_missing, coded_missing);
} }
if data_missing > 0 { if data_missing > 0 {
if (data_missing + coded_missing) <= MAX_MISSING { if (data_missing + coded_missing) <= MAX_MISSING {
debug!("2: recovering: data: {} coding: {}", data_missing, coded_missing);
let mut blobs: Vec<SharedBlob> = Vec::new(); let mut blobs: Vec<SharedBlob> = Vec::new();
let mut locks = Vec::new(); let mut locks = Vec::new();
let mut erasures: Vec<i32> = Vec::new(); let mut erasures: Vec<i32> = Vec::new();

19
src/streamer.rs
View File

@ -268,6 +268,12 @@ fn recv_window(
if pix > *received { if pix > *received {
*received = pix; *received = pix;
} }
// Got a blob which has already been consumed, skip it
// probably from a repair window request
if pix < *consumed {
info!("received: {} but older than consumed: {} skipping..", pix, *consumed);
continue;
}
let w = pix % WINDOW_SIZE; let w = pix % WINDOW_SIZE;
//TODO, after the block are authenticated //TODO, after the block are authenticated
//if we get different blocks at the same index //if we get different blocks at the same index
@ -299,9 +305,18 @@ fn recv_window(
} }
if !is_coding { if !is_coding {
contq.push_back(window[k].clone().expect("clone in fn recv_window")); contq.push_back(window[k].clone().expect("clone in fn recv_window"));
*consumed += 1;
} else {
let block_start = *consumed - (*consumed % erasure::NUM_CODED);
let coding_end = block_start + erasure::NUM_CODED;
// We've received all this block's data blobs, go and null out the window now
for j in block_start..coding_end {
window[j % WINDOW_SIZE] = None;
}
*consumed += erasure::MAX_MISSING;
info!("skipping processing coding blob k: {} consumed: {}", k, *consumed);
} }
window[k] = None;
*consumed += 1;
} }
} }
} }