Use epoch as the gossip purge timeout for staked nodes. (#7005)

automerge

core/src/crds.rs

@@ -30,6 +30,7 @@ use indexmap::map::IndexMap;
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::pubkey::Pubkey;
 use std::cmp;
+use std::collections::HashMap;
 
 #[derive(Clone)]
 pub struct Crds {
@@ -141,12 +142,25 @@ impl Crds {
         }
     }
 
-    /// find all the keys that are older or equal to min_ts
-    pub fn find_old_labels(&self, min_ts: u64) -> Vec<CrdsValueLabel> {
+    /// Find all the keys that are older or equal to the timeout.
+    /// * timeouts - Pubkey specific timeouts with Pubkey::default() as the default timeout.
+    pub fn find_old_labels(
+        &self,
+        now: u64,
+        timeouts: &HashMap<Pubkey, u64>,
+    ) -> Vec<CrdsValueLabel> {
+        let min_ts = *timeouts
+            .get(&Pubkey::default())
+            .expect("must have default timeout");
         self.table
             .iter()
             .filter_map(|(k, v)| {
-                if v.local_timestamp <= min_ts {
+                if now < v.local_timestamp
+                    || (timeouts.get(&k.pubkey()).is_some()
+                        && now - v.local_timestamp < timeouts[&k.pubkey()])
+                {
+                    None
+                } else if now - v.local_timestamp >= min_ts {
                     Some(k)
                 } else {
                     None
@@ -237,25 +251,69 @@ mod test {
         assert_eq!(crds.table[&val2.label()].insert_timestamp, 3);
     }
     #[test]
-    fn test_find_old_records() {
+    fn test_find_old_records_default() {
         let mut crds = Crds::default();
         let val = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::default()));
         assert_eq!(crds.insert(val.clone(), 1), Ok(None));
-
-        assert!(crds.find_old_labels(0).is_empty());
-        assert_eq!(crds.find_old_labels(1), vec![val.label()]);
-        assert_eq!(crds.find_old_labels(2), vec![val.label()]);
+        let mut set = HashMap::new();
+        set.insert(Pubkey::default(), 0);
+        assert!(crds.find_old_labels(0, &set).is_empty());
+        set.insert(Pubkey::default(), 1);
+        assert_eq!(crds.find_old_labels(2, &set), vec![val.label()]);
+        set.insert(Pubkey::default(), 2);
+        assert_eq!(crds.find_old_labels(4, &set), vec![val.label()]);
     }
     #[test]
-    fn test_remove() {
+    fn test_remove_default() {
         let mut crds = Crds::default();
         let val = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::default()));
         assert_matches!(crds.insert(val.clone(), 1), Ok(_));
-
-        assert_eq!(crds.find_old_labels(1), vec![val.label()]);
+        let mut set = HashMap::new();
+        set.insert(Pubkey::default(), 1);
+        assert_eq!(crds.find_old_labels(2, &set), vec![val.label()]);
         crds.remove(&val.label());
-        assert!(crds.find_old_labels(1).is_empty());
+        assert!(crds.find_old_labels(2, &set).is_empty());
     }
+    #[test]
+    fn test_find_old_records_staked() {
+        let mut crds = Crds::default();
+        let val = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::default()));
+        assert_eq!(crds.insert(val.clone(), 1), Ok(None));
+        let mut set = HashMap::new();
+        //now < timestamp
+        set.insert(Pubkey::default(), 0);
+        set.insert(val.pubkey(), 0);
+        assert!(crds.find_old_labels(0, &set).is_empty());
+
+        //pubkey shouldn't expire since its timeout is MAX
+        set.insert(val.pubkey(), std::u64::MAX);
+        assert!(crds.find_old_labels(2, &set).is_empty());
+
+        //default has max timeout, but pubkey should still expire
+        set.insert(Pubkey::default(), std::u64::MAX);
+        set.insert(val.pubkey(), 1);
+        assert_eq!(crds.find_old_labels(2, &set), vec![val.label()]);
+
+        set.insert(val.pubkey(), 2);
+        assert!(crds.find_old_labels(2, &set).is_empty());
+        assert_eq!(crds.find_old_labels(3, &set), vec![val.label()]);
+    }
+
+    #[test]
+    fn test_remove_staked() {
+        let mut crds = Crds::default();
+        let val = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::default()));
+        assert_matches!(crds.insert(val.clone(), 1), Ok(_));
+        let mut set = HashMap::new();
+
+        //default has max timeout, but pubkey should still expire
+        set.insert(Pubkey::default(), std::u64::MAX);
+        set.insert(val.pubkey(), 1);
+        assert_eq!(crds.find_old_labels(2, &set), vec![val.label()]);
+        crds.remove(&val.label());
+        assert!(crds.find_old_labels(2, &set).is_empty());
+    }
+
     #[test]
     fn test_equal() {
         let val = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::default()));