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

substrate/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))?;
 		}
 	}
 

substrate/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)?)
 		},