Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 1596dd2

Browse files
insights: Add no-op migrator for insights oob migration (#39894)
1 parent 19d4ba4 commit 1596dd2

File tree

2 files changed

+36
-8
lines changed

2 files changed

+36
-8
lines changed

enterprise/internal/insights/insights.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,18 @@ func InitializeCodeInsightsDB(app string) (edb.InsightsDB, error) {
7474
}
7575

7676
func RegisterMigrations(db database.DB, outOfBandMigrationRunner *oobmigration.Runner) error {
77+
var insightsMigrator oobmigration.Migrator
7778
if !IsEnabled() {
78-
return nil
79-
}
80-
81-
insightsDB, err := InitializeCodeInsightsDB("worker-oobmigrator")
82-
if err != nil {
83-
return err
79+
// This allows this migration to be "complete" even when insights is not enabled.
80+
insightsMigrator = migration.NewMigratorNoOp()
81+
} else {
82+
insightsDB, err := InitializeCodeInsightsDB("worker-oobmigrator")
83+
if err != nil {
84+
return err
85+
}
86+
insightsMigrator = migration.NewMigrator(insightsDB, db)
8487
}
8588

86-
insightsMigrator := migration.NewMigrator(insightsDB, db)
87-
8889
// This id (14) was defined arbitrarily in this migration file: 1528395945_settings_migration_out_of_band.up.sql.
8990
if err := outOfBandMigrationRunner.Register(14, insightsMigrator, oobmigration.MigratorOptions{Interval: 10 * time.Second}); err != nil {
9091
return errors.Wrap(err, "failed to register settings migration job")
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package migration
2+
3+
import (
4+
"context"
5+
6+
"github.com/sourcegraph/sourcegraph/internal/oobmigration"
7+
)
8+
9+
type migratorNoOp struct {
10+
}
11+
12+
func NewMigratorNoOp() oobmigration.Migrator {
13+
return &migratorNoOp{}
14+
}
15+
16+
func (m *migratorNoOp) Progress(ctx context.Context) (float64, error) {
17+
return 1, nil
18+
}
19+
20+
func (m *migratorNoOp) Up(ctx context.Context) (err error) {
21+
22+
return nil
23+
}
24+
25+
func (m *migratorNoOp) Down(ctx context.Context) (err error) {
26+
return nil
27+
}

0 commit comments

Comments
 (0)