Skip to content

Commit f2fa98b

Browse files
nipunn1313Convex, Inc.
authored andcommitted
Fix snapshot import failure in the waiting for confirmation (#42129)
Previously in waiting-for-confirmation, if you hit a failure, it would fail without setting things to error. GitOrigin-RevId: 0e689c485c0c6a9476437f1667fa7e039ffde135
1 parent b969241 commit f2fa98b

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

crates/application/src/snapshot_import/confirmation.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ pub async fn info_message_for_import<RT: Runtime>(
4545
executor: &SnapshotImportExecutor<RT>,
4646
snapshot_import: ParsedDocument<SnapshotImport>,
4747
) -> anyhow::Result<(String, bool, Vec<ImportTableCheckpoint>)> {
48+
executor.fail_if_too_old(&snapshot_import)?;
4849
let mut message_lines = Vec::new();
4950
let (content_confirmation_messages, require_manual_confirmation, new_checkpoints) =
5051
messages_to_confirm_replace(executor, snapshot_import).await?;

crates/application/src/snapshot_import/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ impl<RT: Runtime> SnapshotImportExecutor<RT> {
186186
anyhow::ensure!(snapshot_import.state == ImportState::Uploaded);
187187
tracing::info!("Marking snapshot import as WaitingForConfirmation");
188188
let import_id = snapshot_import.id();
189-
self.fail_if_too_old(&snapshot_import)?;
190189
match info_message_for_import(self, snapshot_import).await {
191190
Ok((info_message, require_manual_confirmation, new_checkpoints)) => {
192191
self.database

0 commit comments

Comments
 (0)