From d90b80d993444c88d68d41fe0057becd7b5ea0ec Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:12:27 +0200 Subject: [PATCH] [v10.0.x] Fix: Create store only once in cli mode (#70755) Fix: Create store only once in cli mode (#70391) fix: create store only once in cli mode (cherry picked from commit 47b2e7f1d7f3dc071fd6699eac7b8dea0cfde710) Co-authored-by: Serge Zaitsev --- pkg/cmd/grafana-cli/commands/commands.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkg/cmd/grafana-cli/commands/commands.go b/pkg/cmd/grafana-cli/commands/commands.go index a59b209986b..49d98f53962 100644 --- a/pkg/cmd/grafana-cli/commands/commands.go +++ b/pkg/cmd/grafana-cli/commands/commands.go @@ -6,16 +6,13 @@ import ( "github.com/urfave/cli/v2" - "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/cmd/grafana-cli/commands/datamigrations" "github.com/grafana/grafana/pkg/cmd/grafana-cli/commands/secretsmigrations" "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger" "github.com/grafana/grafana/pkg/cmd/grafana-cli/services" "github.com/grafana/grafana/pkg/cmd/grafana-cli/utils" "github.com/grafana/grafana/pkg/infra/db" - "github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/server" - "github.com/grafana/grafana/pkg/services/sqlstore/migrations" "github.com/grafana/grafana/pkg/setting" ) @@ -42,18 +39,7 @@ func runDbCommand(command func(commandLine utils.CommandLine, sqlStore db.DB) er return fmt.Errorf("%v: %w", "failed to initialize runner", err) } - tracer, err := tracing.ProvideService(runner.Cfg) - if err != nil { - return fmt.Errorf("%v: %w", "failed to initialize tracer service", err) - } - - bus := bus.ProvideBus(tracer) - - sqlStore, err := db.ProvideService(runner.Cfg, nil, &migrations.OSSMigrations{}, bus, tracer) - if err != nil { - return fmt.Errorf("%v: %w", "failed to initialize SQL store", err) - } - + sqlStore := runner.SQLStore if err := command(cmd, sqlStore); err != nil { return err }