Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

writes epoch-slots to crds table synchronously #17719

Merged
merged 2 commits into from
Jun 4, 2021
Merged

writes epoch-slots to crds table synchronously #17719

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb8d2ec
writes epoch-slots to crds table synchronously
behzadnouri Jun 3, 2021
df33e6b
removes flush_push_queue from push_epoch_slots tests
behzadnouri Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions gossip/src/cluster_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]) {
let current_slots: Vec<_> = {
let gossip =
Expand Down Expand Up @@ -933,26 +935,28 @@ impl ClusterInfo {
Some((_wallclock, _slot, index)) => *index,
None => 0,
};
let self_pubkey = self.id();
let mut entries = Vec::default();
while !update.is_empty() {
let ix = (epoch_slot_index % crds_value::MAX_EPOCH_SLOTS) as u8;
let now = timestamp();
let mut slots = if !reset {
self.lookup_epoch_slots(ix)
} else {
EpochSlots::new(self.id(), now)
EpochSlots::new(self_pubkey, now)
};
let n = slots.fill(update, now);
update = &update[n..];
if n > 0 {
let entry = CrdsValue::new_signed(CrdsData::EpochSlots(ix, slots), &self.keypair);
self.local_message_pending_push_queue
.lock()
.unwrap()
.push(entry);
let epoch_slots = CrdsData::EpochSlots(ix, slots);
let entry = CrdsValue::new_signed(epoch_slots, &self.keypair);
entries.push(entry);
}
epoch_slot_index += 1;
reset = true;
}
let mut gossip = self.gossip.write().unwrap();
gossip.process_push_message(&self_pubkey, entries, timestamp());
}

fn time_gossip_read_lock<'a>(
Expand Down Expand Up @@ -3777,7 +3781,6 @@ mod tests {
let slots = cluster_info.get_epoch_slots(&mut Cursor::default());
assert!(slots.is_empty());
cluster_info.push_epoch_slots(&[0]);
cluster_info.flush_push_queue();

let mut cursor = Cursor::default();
let slots = cluster_info.get_epoch_slots(&mut cursor);
Expand Down Expand Up @@ -4134,9 +4137,7 @@ mod tests {
range.push(last + rand::thread_rng().gen_range(1, 32));
}
cluster_info.push_epoch_slots(&range[..16000]);
cluster_info.flush_push_queue();
cluster_info.push_epoch_slots(&range[16000..]);
cluster_info.flush_push_queue();
let slots = cluster_info.get_epoch_slots(&mut Cursor::default());
let slots: Vec<_> = slots.iter().flat_map(|x| x.to_slots(0)).collect();
assert_eq!(slots, range);
Expand Down