@@ -257,15 +257,15 @@ func versionIsDeployed(db *sql.DB) (result bool, err error) {
257
257
}
258
258
259
259
// 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 {
261
261
query := `
262
262
replace into orchestrator_db_deployments (
263
263
deployed_version, deployed_timestamp
264
264
) values (
265
265
?, NOW()
266
266
)
267
267
`
268
- if _ , err := execInternal (db , query , config .RuntimeCLIFlags .ConfiguredVersion ); err != nil {
268
+ if _ , err := execInternal (ctx , db , query , config .RuntimeCLIFlags .ConfiguredVersion ); err != nil {
269
269
log .Fatalf ("Unable to write to orchestrator_metadata: %+v" , err )
270
270
}
271
271
log .Debugf ("Migrated database schema to version [%+v]" , config .RuntimeCLIFlags .ConfiguredVersion )
@@ -274,7 +274,7 @@ func registerOrchestratorDeployment(db *sql.DB) error {
274
274
275
275
// deployStatements will issue given sql queries that are not already known to be deployed.
276
276
// 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 {
278
278
tx , err := db .Begin ()
279
279
if err != nil {
280
280
log .Fatale (err )
@@ -336,6 +336,7 @@ func deployStatements(db *sql.DB, queries []string) error {
336
336
// initOrchestratorDB attempts to create/upgrade the orchestrator backend database. It is created once in the
337
337
// application's lifetime.
338
338
func initOrchestratorDB (db * sql.DB ) error {
339
+ ctx := context .Background ()
339
340
log .Debug ("Initializing orchestrator" )
340
341
341
342
versionAlreadyDeployed , err := versionIsDeployed (db )
@@ -347,9 +348,9 @@ func initOrchestratorDB(db *sql.DB) error {
347
348
log .Fatalf ("PanicIfDifferentDatabaseDeploy is set. Configured version %s is not the version found in the database" , config .RuntimeCLIFlags .ConfiguredVersion )
348
349
}
349
350
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 )
353
354
354
355
if IsSQLite () {
355
356
ExecOrchestrator (`PRAGMA journal_mode = WAL` )
@@ -360,13 +361,13 @@ func initOrchestratorDB(db *sql.DB) error {
360
361
}
361
362
362
363
// 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 ) {
364
365
var err error
365
366
query , err = translateStatement (query )
366
367
if err != nil {
367
368
return nil , err
368
369
}
369
- res , err := sqlutils .ExecNoPrepare (context . Background () , db , query , args ... )
370
+ res , err := sqlutils .ExecNoPrepare (ctx , db , query , args ... )
370
371
return res , err
371
372
}
372
373
0 commit comments