Skip to content

fix(sqlite-storage): allow invalidate_v1_migration on non-migrating META #4813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NathanFlurry wants to merge 1 commit into from
+13 −5
Closed

fix(sqlite-storage): allow invalidate_v1_migration on non-migrating META #4813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions engine/packages/sqlite-storage/src/open.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use std::collections::{BTreeMap, BTreeSet};
use std::time::Instant;

use anyhow::{Context, Result, ensure};
use anyhow::{Context, Result, bail, ensure};

use crate::engine::{OpenDb, SqliteEngine};
use crate::error::SqliteStorageError;
Expand Down Expand Up @@ -113,10 +113,18 @@ impl SqliteEngine {
udb::tx_get_value_serializable(&tx, &subspace, &meta_storage_key).await?
{
let existing_head = decode_db_head(&existing_meta)?;
ensure!(
matches!(existing_head.origin, SqliteOrigin::MigratingFromV1),
SqliteStorageError::InvalidV1MigrationState
);
if !matches!(existing_head.origin, SqliteOrigin::MigratingFromV1) {
// Actor has already moved past v1 migration (Native or
// MigratedFromV1). For invalidate_v1_migration this is a
// no-op — there is nothing stale to clean up. For
// prepare_v1_migration this is a bug because the caller
// is trying to start a fresh v1 migration over an actor
// already on v2.
if require_stage_in_progress {
return Ok(None);
}
bail!(SqliteStorageError::InvalidV1MigrationState);
}
let stage_in_progress =
existing_head.next_txid > existing_head.head_txid.saturating_add(1);
if require_stage_in_progress && !stage_in_progress {
Expand Down
Loading