From d876f214e5500962d6acc1f99a6f2f7c5f63db8b Mon Sep 17 00:00:00 2001 From: Ferenc Szabo Date: Tue, 20 Nov 2018 08:30:38 +0100 Subject: swarm/storage: move 'running migrations for' log line (#18120) So that we only see the log message when we actually have to migrate. --- swarm/storage/localstore.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'swarm') diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index fa98848dd..111821ff6 100644 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -194,7 +194,8 @@ func (ls *LocalStore) Close() { ls.DbStore.Close() } -// Migrate checks the datastore schema vs the runtime schema, and runs migrations if they don't match +// Migrate checks the datastore schema vs the runtime schema and runs +// migrations if they don't match func (ls *LocalStore) Migrate() error { actualDbSchema, err := ls.DbStore.GetSchema() if err != nil { @@ -202,12 +203,12 @@ func (ls *LocalStore) Migrate() error { return err } - log.Debug("running migrations for", "schema", actualDbSchema, "runtime-schema", CurrentDbSchema) - if actualDbSchema == CurrentDbSchema { return nil } + log.Debug("running migrations for", "schema", actualDbSchema, "runtime-schema", CurrentDbSchema) + if actualDbSchema == DbSchemaNone { ls.migrateFromNoneToPurity() actualDbSchema = DbSchemaPurity -- cgit