From 392c1a71c98c51ff5600ff7363814b984f525a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Qu=C3=A9m=C3=A9ner?= Date: Fri, 23 May 2025 14:11:21 +0200 Subject: [PATCH] Storage: Take `migration_locking` setting into account (#105938) --- pkg/storage/unified/sql/db/migrations/migrator.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/storage/unified/sql/db/migrations/migrator.go b/pkg/storage/unified/sql/db/migrations/migrator.go index e63fc7c138a..e8b5faae727 100644 --- a/pkg/storage/unified/sql/db/migrations/migrator.go +++ b/pkg/storage/unified/sql/db/migrations/migrator.go @@ -9,14 +9,16 @@ import ( "github.com/grafana/grafana/pkg/setting" ) -func MigrateResourceStore(_ context.Context, engine *xorm.Engine, cfg *setting.Cfg) error { - // TODO: use the context.Context - +func MigrateResourceStore(ctx context.Context, engine *xorm.Engine, cfg *setting.Cfg) error { mg := migrator.NewScopedMigrator(engine, cfg, "resource") mg.AddCreateMigration() initResourceTables(mg) - // since it's a new feature enable migration locking by default - return mg.Start(true, 0) + sec := cfg.Raw.Section("database") + return mg.RunMigrations( + ctx, + sec.Key("migration_locking").MustBool(true), + sec.Key("locking_attempt_timeout_sec").MustInt(), + ) }