blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

writes epoch-slots to crds table synchronously (#17719) 

epoch-slots may be overwritten before they are written to crds table:
https://github.com/solana-labs/solana/issues/17711

This commit writes new epoch-slots to crds table synchronously with
push_epoch_slots. The functions is still not thread-safe as commented in
the code, however currently only one threads is invoking this code.
This commit is contained in:
behzad nouri 2021-06-04 13:56:51 +00:00 committed by GitHub
parent be957f25c9
commit 60b0a13444
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gossip/src/cluster_info.rs
View File

@ -897,6 +897,8 @@ impl ClusterInfo {
} }
} }
// TODO: If two threads call into this function then epoch_slot_index has a
// race condition and the threads will overwrite each other in crds table.
pub fn push_epoch_slots(&self, mut update: &[Slot]) { pub fn push_epoch_slots(&self, mut update: &[Slot]) {
let current_slots: Vec<_> = { let current_slots: Vec<_> = {
let gossip = let gossip =
@ -933,26 +935,28 @@ impl ClusterInfo {
Some((_wallclock, _slot, index)) => *index, Some((_wallclock, _slot, index)) => *index,
None => 0, None => 0,
}; };
let self_pubkey = self.id();
let mut entries = Vec::default();
while !update.is_empty() { while !update.is_empty() {
let ix = (epoch_slot_index % crds_value::MAX_EPOCH_SLOTS) as u8; let ix = (epoch_slot_index % crds_value::MAX_EPOCH_SLOTS) as u8;
let now = timestamp(); let now = timestamp();
let mut slots = if !reset { let mut slots = if !reset {
self.lookup_epoch_slots(ix) self.lookup_epoch_slots(ix)
} else { } else {
EpochSlots::new(self.id(), now) EpochSlots::new(self_pubkey, now)
}; };
let n = slots.fill(update, now); let n = slots.fill(update, now);
update = &update[n..]; update = &update[n..];
if n > 0 { if n > 0 {
let entry = CrdsValue::new_signed(CrdsData::EpochSlots(ix, slots), &self.keypair); let epoch_slots = CrdsData::EpochSlots(ix, slots);
self.local_message_pending_push_queue let entry = CrdsValue::new_signed(epoch_slots, &self.keypair);
.lock() entries.push(entry);
.unwrap()
.push(entry);
} }
epoch_slot_index += 1; epoch_slot_index += 1;
reset = true; reset = true;
} }
let mut gossip = self.gossip.write().unwrap();
gossip.process_push_message(&self_pubkey, entries, timestamp());
} }
fn time_gossip_read_lock<'a>( fn time_gossip_read_lock<'a>(
@ -3778,7 +3782,6 @@ mod tests {
let slots = cluster_info.get_epoch_slots(&mut Cursor::default()); let slots = cluster_info.get_epoch_slots(&mut Cursor::default());
assert!(slots.is_empty()); assert!(slots.is_empty());
cluster_info.push_epoch_slots(&[0]); cluster_info.push_epoch_slots(&[0]);
cluster_info.flush_push_queue();
let mut cursor = Cursor::default(); let mut cursor = Cursor::default();
let slots = cluster_info.get_epoch_slots(&mut cursor); let slots = cluster_info.get_epoch_slots(&mut cursor);
@ -4135,9 +4138,7 @@ mod tests {
range.push(last + rand::thread_rng().gen_range(1, 32)); range.push(last + rand::thread_rng().gen_range(1, 32));
} }
cluster_info.push_epoch_slots(&range[..16000]); cluster_info.push_epoch_slots(&range[..16000]);
cluster_info.flush_push_queue();
cluster_info.push_epoch_slots(&range[16000..]); cluster_info.push_epoch_slots(&range[16000..]);
cluster_info.flush_push_queue();
let slots = cluster_info.get_epoch_slots(&mut Cursor::default()); let slots = cluster_info.get_epoch_slots(&mut Cursor::default());
let slots: Vec<_> = slots.iter().flat_map(|x| x.to_slots(0)).collect(); let slots: Vec<_> = slots.iter().flat_map(|x| x.to_slots(0)).collect();
assert_eq!(slots, range); assert_eq!(slots, range);