From 577c29d0dca45575394129d1d828d7783274bf50 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Fri, 23 May 2025 15:37:30 +0200 Subject: [PATCH] [release-12.0.1] Storage: Take `migration_locking` setting into account (#105951) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Storage: Take `migration_locking` setting into account (#105938) (cherry picked from commit 392c1a71c98c51ff5600ff7363814b984f525a7e) Co-authored-by: Jean-Philippe Quéméner --- 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 dcc8af131f3..04f50e3ee96 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(), + ) }