Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

Commit a8dbfed

Browse files
committed
compute ctx once
Signed-off-by: Shlomi Noach <[email protected]>
1 parent 94f34bf commit a8dbfed

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

go/db/db.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,15 @@ func versionIsDeployed(db *sql.DB) (result bool, err error) {
257257
}
258258

259259
// registerOrchestratorDeployment updates the orchestrator_metadata table upon successful deployment
260-
func registerOrchestratorDeployment(db *sql.DB) error {
260+
func registerOrchestratorDeployment(ctx context.Context, db *sql.DB) error {
261261
query := `
262262
replace into orchestrator_db_deployments (
263263
deployed_version, deployed_timestamp
264264
) values (
265265
?, NOW()
266266
)
267267
`
268-
if _, err := execInternal(db, query, config.RuntimeCLIFlags.ConfiguredVersion); err != nil {
268+
if _, err := execInternal(ctx, db, query, config.RuntimeCLIFlags.ConfiguredVersion); err != nil {
269269
log.Fatalf("Unable to write to orchestrator_metadata: %+v", err)
270270
}
271271
log.Debugf("Migrated database schema to version [%+v]", config.RuntimeCLIFlags.ConfiguredVersion)
@@ -274,7 +274,7 @@ func registerOrchestratorDeployment(db *sql.DB) error {
274274

275275
// deployStatements will issue given sql queries that are not already known to be deployed.
276276
// This iterates both lists (to-run and already-deployed) and also verifies no contraditions.
277-
func deployStatements(db *sql.DB, queries []string) error {
277+
func deployStatements(ctx context.Context, db *sql.DB, queries []string) error {
278278
tx, err := db.Begin()
279279
if err != nil {
280280
log.Fatale(err)
@@ -336,6 +336,7 @@ func deployStatements(db *sql.DB, queries []string) error {
336336
// initOrchestratorDB attempts to create/upgrade the orchestrator backend database. It is created once in the
337337
// application's lifetime.
338338
func initOrchestratorDB(db *sql.DB) error {
339+
ctx := context.Background()
339340
log.Debug("Initializing orchestrator")
340341

341342
versionAlreadyDeployed, err := versionIsDeployed(db)
@@ -347,9 +348,9 @@ func initOrchestratorDB(db *sql.DB) error {
347348
log.Fatalf("PanicIfDifferentDatabaseDeploy is set. Configured version %s is not the version found in the database", config.RuntimeCLIFlags.ConfiguredVersion)
348349
}
349350
log.Debugf("Migrating database schema")
350-
deployStatements(db, generateSQLBase)
351-
deployStatements(db, generateSQLPatches)
352-
registerOrchestratorDeployment(db)
351+
deployStatements(ctx, db, generateSQLBase)
352+
deployStatements(ctx, db, generateSQLPatches)
353+
registerOrchestratorDeployment(ctx, db)
353354

354355
if IsSQLite() {
355356
ExecOrchestrator(`PRAGMA journal_mode = WAL`)
@@ -360,13 +361,13 @@ func initOrchestratorDB(db *sql.DB) error {
360361
}
361362

362363
// execInternal
363-
func execInternal(db *sql.DB, query string, args ...interface{}) (sql.Result, error) {
364+
func execInternal(ctx context.Context, db *sql.DB, query string, args ...interface{}) (sql.Result, error) {
364365
var err error
365366
query, err = translateStatement(query)
366367
if err != nil {
367368
return nil, err
368369
}
369-
res, err := sqlutils.ExecNoPrepare(context.Background(), db, query, args...)
370+
res, err := sqlutils.ExecNoPrepare(ctx, db, query, args...)
370371
return res, err
371372
}
372373

vendor/github.com/openark/golib/sqlutils/sqlutils.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)