From 14e62928c43daa8504c0d1b184d732e2a00924dd Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Mon, 18 Jul 2022 18:21:42 +1000 Subject: [PATCH] Tweak migrations --- beacon_node/beacon_chain/src/schema_change.rs | 6 ++++-- .../beacon_chain/src/schema_change/migration_schema_v11.rs | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/beacon_node/beacon_chain/src/schema_change.rs b/beacon_node/beacon_chain/src/schema_change.rs index 1b9a9f5067..a2ce448c93 100644 --- a/beacon_node/beacon_chain/src/schema_change.rs +++ b/beacon_node/beacon_chain/src/schema_change.rs @@ -131,8 +131,10 @@ pub fn migrate_schema( migration_schema_v9::downgrade_from_v9::(db.clone(), log)?; db.store_schema_version(to) } - // Upgrade from v9 to v11 to store richer metadata in the attestation op pool. - (SchemaVersion(9), SchemaVersion(11)) => { + // FIXME(sproul): stub for Sean's v10 migration + (SchemaVersion(9), SchemaVersion(10)) => db.store_schema_version(to), + // Upgrade from v10 to v11 to store richer metadata in the attestation op pool. + (SchemaVersion(10), SchemaVersion(11)) => { let ops = migration_schema_v11::upgrade_to_v11::(db.clone(), log)?; db.store_schema_version_atomically(to, ops) } diff --git a/beacon_node/beacon_chain/src/schema_change/migration_schema_v11.rs b/beacon_node/beacon_chain/src/schema_change/migration_schema_v11.rs index 4eb1609f90..a71f697b73 100644 --- a/beacon_node/beacon_chain/src/schema_change/migration_schema_v11.rs +++ b/beacon_node/beacon_chain/src/schema_change/migration_schema_v11.rs @@ -1,6 +1,6 @@ use crate::beacon_chain::{BeaconChainTypes, OP_POOL_DB_KEY}; use operation_pool::{PersistedOperationPool, PersistedOperationPoolV11, PersistedOperationPoolV5}; -use slog::{debug, Logger}; +use slog::{debug, info, Logger}; use std::sync::Arc; use store::{Error, HotColdDB, KeyValueStoreOp, StoreItem}; @@ -47,7 +47,7 @@ pub fn downgrade_from_v11( return Ok(vec![]); }; - debug!( + info!( log, "Dropping attestations from pool"; "count" => v11.attestations.len(),