Fix non-erasure blob nulling

This commit is contained in:
Stephen Akridge
2018-06-05 12:30:08 -07:00
committed by Greg Fitzgerald
parent a06535d7ed
commit a710d95243

View File

@ -319,7 +319,14 @@ 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; *consumed += 1;
#[cfg(not(feature = "erasure"))]
{
window[k] = None;
}
} else { } else {
#[cfg(feature = "erasure")]
{
let block_start = *consumed - (*consumed % erasure::NUM_CODED); let block_start = *consumed - (*consumed % erasure::NUM_CODED);
let coding_end = block_start + 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 // We've received all this block's data blobs, go and null out the window now
@ -336,6 +343,7 @@ fn recv_window(
} }
} }
} }
}
print_window(locked_window, *consumed); print_window(locked_window, *consumed);
trace!("sending contq.len: {}", contq.len()); trace!("sending contq.len: {}", contq.len());
if !contq.is_empty() { if !contq.is_empty() {