storage-bigtable: delete entry rows if they exist when deleting confi…

…rmed block (solana-labs#34261) Delete entry rows if they exist
anza-xyz · Nov 29, 2023 · ded307a · ded307a
1 parent 2bde5c3
commit ded307a
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/storage-bigtable/src/lib.rs b/storage-bigtable/src/lib.rs
@@ -1133,6 +1133,13 @@ impl LedgerStorage {
             vec![]
         };
 
+        let entries_exist = self
+            .connection
+            .client()
+            .row_key_exists("entries", slot_to_entries_key(slot))
+            .await
+            .is_ok_and(|x| x);
+
         if !dry_run {
             if !address_slot_rows.is_empty() {
                 self.connection
@@ -1146,17 +1153,24 @@ impl LedgerStorage {
                     .await?;
             }
 
+            if entries_exist {
+                self.connection
+                    .delete_rows_with_retry("entries", &[slot_to_entries_key(slot)])
+                    .await?;
+            }
+
             self.connection
                 .delete_rows_with_retry("blocks", &[slot_to_blocks_key(slot)])
                 .await?;
         }
 
         info!(
-            "{}deleted ledger data for slot {}: {} transaction rows, {} address slot rows",
+            "{}deleted ledger data for slot {}: {} transaction rows, {} address slot rows, {} entry row",
             if dry_run { "[dry run] " } else { "" },
             slot,
             tx_deletion_rows.len(),
-            address_slot_rows.len()
+            address_slot_rows.len(),
+            if entries_exist { "with" } else {"WITHOUT"}
         );
 
         Ok(())