v1.16: Skip shrink until startup verification is complete (backport of …

…#34209) (#34226)

runtime/src/accounts_background_service.rs

@@ -664,7 +664,16 @@ impl AccountsBackgroundService {
                             bank.clean_accounts(last_full_snapshot_slot);
                             last_cleaned_block_height = bank.block_height();
                         }
-                        bank.shrink_candidate_slots();
+                        // Do not 'shrink' until *after* the startup verification is complete.
+                        // This is because startup verification needs to get the snapshot
+                        // storages *as they existed at startup* (to calculate the accounts hash).
+                        // If 'shrink' were to run, then it is possible startup verification
+                        // (1) could race with 'shrink', and fail to assert that shrinking is not in
+                        // progress, or (2) could get snapshot storages that were newer than what
+                        // was in the snapshot itself.
+                        if bank.is_startup_verification_complete() {
+                            bank.shrink_candidate_slots();
+                        }
                     }
                     stats.record_and_maybe_submit(start_time.elapsed());
                     sleep(Duration::from_millis(INTERVAL_MS));