From 7f608965ef6f271d4be1ef719e3d902405e0dfd3 Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)" <wash678@gmail.com>
Date: Thu, 3 Mar 2022 09:09:31 -0600
Subject: [PATCH] new counter data point for unexpected rent_epoch (#23449)

---
 runtime/src/rent_collector.rs | 38 ++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/runtime/src/rent_collector.rs b/runtime/src/rent_collector.rs
index a960e95dcd..fe2c9d42e5 100644
--- a/runtime/src/rent_collector.rs
+++ b/runtime/src/rent_collector.rs
@@ -1,12 +1,15 @@
 //! calculate and collect rent from Accounts
-use solana_sdk::{
-    account::{AccountSharedData, ReadableAccount, WritableAccount},
-    clock::Epoch,
-    epoch_schedule::EpochSchedule,
-    genesis_config::GenesisConfig,
-    incinerator,
-    pubkey::Pubkey,
-    rent::{Rent, RentDue},
+use {
+    log::*,
+    solana_sdk::{
+        account::{AccountSharedData, ReadableAccount, WritableAccount},
+        clock::Epoch,
+        epoch_schedule::EpochSchedule,
+        genesis_config::GenesisConfig,
+        incinerator,
+        pubkey::Pubkey,
+        rent::{Rent, RentDue},
+    },
 };
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, Debug, AbiExample)]
@@ -89,7 +92,8 @@ impl RentCollector {
         {
             RentDue::Exempt
         } else {
-            let slots_elapsed: u64 = (account.rent_epoch()..=self.epoch)
+            let account_rent_epoch = account.rent_epoch();
+            let slots_elapsed: u64 = (account_rent_epoch..=self.epoch)
                 .map(|epoch| self.epoch_schedule.get_slots_in_epoch(epoch + 1))
                 .sum();
 
@@ -101,7 +105,21 @@ impl RentCollector {
             };
 
             // we know this account is not exempt
-            RentDue::Paying(self.rent.due_amount(account.data().len(), years_elapsed))
+            let due = self.rent.due_amount(account.data().len(), years_elapsed);
+
+            // we expect rent_epoch to always be one of: {0, self.epoch-1, self.epoch, self.epoch+1}
+            if account_rent_epoch != 0
+                && (account_rent_epoch + 1 < self.epoch || account_rent_epoch > self.epoch + 1)
+            {
+                // this should not occur in a running validator
+                if due == 0 {
+                    inc_new_counter_info!("rent-collector-rent-epoch-range-large-exempt", 1);
+                } else {
+                    inc_new_counter_info!("rent-collector-rent-epoch-range-large-paying", 1);
+                }
+            }
+
+            RentDue::Paying(due)
         }
     }