Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

parity: fix db path when migrating to blooms db #8975

Merged
merged 1 commit into from
Jun 28, 2018
Merged
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions parity/db/rocksdb/migration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ fn consolidated_database_migrations(compaction_profile: &CompactionProfile) -> R
}

/// Migrates database at given position with given migration rules.
fn migrate_database(version: u32, db_path: PathBuf, mut migrations: MigrationManager) -> Result<(), Error> {
fn migrate_database(version: u32, db_path: &Path, mut migrations: MigrationManager) -> Result<(), Error> {
// check if migration is needed
if !migrations.is_needed(version) {
return Ok(())
Expand Down Expand Up @@ -216,10 +216,12 @@ pub fn migrate(path: &Path, compaction_profile: &DatabaseCompactionProfile) -> R
return Ok(())
}

let db_path = consolidated_database_path(path);

// Further migrations
if version < CURRENT_VERSION && exists(&consolidated_database_path(path)) {
if version < CURRENT_VERSION && exists(&db_path) {
println!("Migrating database from version {} to {}", version, CURRENT_VERSION);
migrate_database(version, consolidated_database_path(path), consolidated_database_migrations(&compaction_profile)?)?;
migrate_database(version, &db_path, consolidated_database_migrations(&compaction_profile)?)?;

if version < BLOOMS_DB_VERSION {
println!("Migrating blooms to blooms-db...");
Expand All @@ -231,7 +233,7 @@ pub fn migrate(path: &Path, compaction_profile: &DatabaseCompactionProfile) -> R
wal: true,
};

migrate_blooms(path, &db_config).map_err(Error::BloomsDB)?;
migrate_blooms(&db_path, &db_config).map_err(Error::BloomsDB)?;
}

println!("Migration finished");
Expand Down