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

allow received to outpace window, we're already constraining repair

Browse Source 
correctly identify sender in ledger_window repair responses, enabling re-transmission
This commit is contained in:
Rob Walker
2018-08-08 14:54:06 -07:00
parent 8331aab26a
commit ce8a4fa831
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crdt.rs
View File

@@ -1025,7 +1025,7 @@ impl Crdt {
let out = entry.to_blob( let out = entry.to_blob(
blob_recycler, blob_recycler,
Some(ix), Some(ix),
Some(from.id), Some(me.id), // causes retransmission if I'm the leader
Some(&from.contact_info.tvu_window), Some(&from.contact_info.tvu_window),
); );

4
src/streamer.rs
View File

@@ -460,7 +460,7 @@ fn blob_idx_in_window(debug_id: u64, pix: u64, consumed: u64, received: &mut u64
// the window. The worst case here is the server *starts* outside // the window. The worst case here is the server *starts* outside
// the window, none of the packets it receives fits in the window // the window, none of the packets it receives fits in the window
// and repair requests (which are based on received) are never generated // and repair requests (which are based on received) are never generated
*received = cmp::min(consumed + WINDOW_SIZE, cmp::max(pix, *received)); *received = cmp::max(pix, *received);
if pix >= consumed + WINDOW_SIZE { if pix >= consumed + WINDOW_SIZE {
trace!( trace!(
@@ -1155,7 +1155,7 @@ mod test {
); );
assert_eq!( assert_eq!(
wrap_blob_idx_in_window(0, 91 + WINDOW_SIZE, 90, 100), wrap_blob_idx_in_window(0, 91 + WINDOW_SIZE, 90, 100),
(false, 90 + WINDOW_SIZE) (false, 91 + WINDOW_SIZE)
); );
assert_eq!(wrap_blob_idx_in_window(0, 89, 90, 100), (false, 100)); assert_eq!(wrap_blob_idx_in_window(0, 89, 90, 100), (false, 100));