Do not upgrade db_version on metadata reading failure. (paritytech#11081

)
moh-eulith · Mar 22, 2022 · 715d004 · 715d004
1 parent c9fc99d
commit 715d004
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
@@ -33,7 +33,7 @@ sc-state-db = { version = "0.10.0-dev", path = "../state-db" }
 sp-trie = { version = "6.0.0", path = "../../primitives/trie" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
-parity-db = { version = "0.3.8", optional = true }
+parity-db = { version = "0.3.9", optional = true }
 
 [dev-dependencies]
 sp-tracing = { version = "5.0.0", path = "../../primitives/tracing" }

diff --git a/client/db/src/parity_db.rs b/client/db/src/parity_db.rs
@@ -73,7 +73,7 @@ pub fn open<H: Clone + AsRef<[u8]>>(
 	if upgrade {
 		log::info!("Upgrading database metadata.");
 		if let Some(meta) = parity_db::Options::load_metadata(path)? {
-			config.write_metadata(path, &meta.salt)?;
+			config.write_metadata_with_version(path, &meta.salt, Some(meta.version))?;
 		}
 	}
 

diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
@@ -275,6 +275,7 @@ fn open_parity_db<Block: BlockT>(path: &Path, db_type: DatabaseType, create: boo
 	match crate::parity_db::open(path, db_type, create, false) {
 		Ok(db) => Ok(db),
 		Err(parity_db::Error::InvalidConfiguration(_)) => {
+			log::warn!("Invalid parity db configuration, attempting database metadata update.");
 			// Try to update the database with the new config
 			Ok(crate::parity_db::open(path, db_type, create, true)?)
 		},