"git.arvados.org/arvados.git/lib/controller/dblock"
"git.arvados.org/arvados.git/lib/ctrlctx"
+ "github.com/sirupsen/logrus"
)
type railsDatabase struct{}
// there are no new migrations, that would add ~2s to startup
// time / downtime during service restart.
- todo := map[string]bool{}
-
- // list versions in db/migrate/{version}_{name}.rb
- fs.WalkDir(os.DirFS(appdir), "db/migrate", func(path string, d fs.DirEntry, err error) error {
- fnm := d.Name()
- if !strings.HasSuffix(fnm, ".rb") {
- return nil
- }
- for i, c := range fnm {
- if i > 0 && c == '_' {
- todo[fnm[:i]] = true
- break
- }
- if c < '0' || c > '9' {
- // non-numeric character before the
- // first '_' means this is not a
- // migration
- break
- }
- }
- return nil
- })
+ todo, err := migrationList(appdir, super.logger)
+ if err != nil {
+ return err
+ }
// read schema_migrations table (list of migrations already
// applied) and remove those entries from todo
defer dblock.RailsMigrations.Unlock()
return super.RunProgram(ctx, appdir, runOptions{env: railsEnv}, "bundle", "exec", "rake", "db:migrate")
}
+
+func migrationList(dir string, log logrus.FieldLogger) (map[string]bool, error) {
+ todo := map[string]bool{}
+
+ // list versions in db/migrate/{version}_{name}.rb
+ err := fs.WalkDir(os.DirFS(dir), "db/migrate", func(path string, d fs.DirEntry, err error) error {
+ if d.IsDir() {
+ return nil
+ }
+ fnm := d.Name()
+ if !strings.HasSuffix(fnm, ".rb") {
+ log.Warnf("unexpected file in db/migrate dir: %s", fnm)
+ return nil
+ }
+ for i, c := range fnm {
+ if i > 0 && c == '_' {
+ todo[fnm[:i]] = true
+ break
+ }
+ if c < '0' || c > '9' {
+ // non-numeric character before the
+ // first '_' means this is not a
+ // migration
+ log.Warnf("unexpected file in db/migrate dir: %s", fnm)
+ return nil
+ }
+ }
+ return nil
+ })
+ if err != nil {
+ return nil, err
+ }
+ return todo, nil
+}