From ea5a52320f90adfd551ec3234e06dc287781434e Mon Sep 17 00:00:00 2001
From: Conor Schaefer <conor@penumbralabs.xyz>
Date: Tue, 7 May 2024 12:20:44 -0700
Subject: [PATCH] fix(migration): release storage locks

Closes #4344. Hat tip to @erwanor for spotting the omission.
---
 crates/bin/pd/src/migrate.rs           | 2 ++
 crates/bin/pd/src/migrate/testnet74.rs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/bin/pd/src/migrate.rs b/crates/bin/pd/src/migrate.rs
index 6c01e1d9d7..13cf89bbbc 100644
--- a/crates/bin/pd/src/migrate.rs
+++ b/crates/bin/pd/src/migrate.rs
@@ -158,6 +158,7 @@ impl Migration {
                 storage.release().await;
                 let storage = Storage::load(rocksdb_dir, SUBSTORE_PREFIXES.to_vec()).await?;
                 let migrated_state = storage.latest_snapshot();
+                storage.release().await;
 
                 // The migration is complete, now we need to generate a genesis file. To do this, we need
                 // to lookup a validator view from the chain, and specify the post-upgrade app hash and
@@ -254,6 +255,7 @@ pub async fn last_block_timestamp(home: PathBuf) -> anyhow::Result<tendermint::T
         .get_block_timestamp()
         .await
         .context("error reading latest block timestamp")?;
+    storage.release().await;
     Ok(last_block_time)
 }
 
diff --git a/crates/bin/pd/src/migrate/testnet74.rs b/crates/bin/pd/src/migrate/testnet74.rs
index 65121efe36..14be42f2b0 100644
--- a/crates/bin/pd/src/migrate/testnet74.rs
+++ b/crates/bin/pd/src/migrate/testnet74.rs
@@ -123,12 +123,12 @@ pub async fn migrate(
 
         (start_time.elapsed().unwrap(), post_upgrade_root_hash)
     };
-
+    storage.release().await;
     tracing::info!(?post_upgrade_root_hash, "post-upgrade root hash");
 
-    storage.release().await;
     let storage = Storage::load(rocksdb_dir, SUBSTORE_PREFIXES.to_vec()).await?;
     let migrated_state = storage.latest_snapshot();
+    storage.release().await;
 
     // The migration is complete, now we need to generate a genesis file. To do this, we need
     // to lookup a validator view from the chain, and specify the post-upgrade app hash and