fix: avoid race condition when running AutoMigrate concurrently

This commit is contained in:
Paul Pan 2023-12-19 16:30:58 +08:00
parent b86ea2737d
commit bb0bf6d39f
Signed by: Paul
GPG Key ID: D639BDF5BA578AF4
3 changed files with 30 additions and 5 deletions

View File

@ -37,10 +37,10 @@ func main() {
Action: wrap(appServer.RunServer), Action: wrap(appServer.RunServer),
}, },
{ {
Name: "init", Name: "migrate",
Aliases: []string{"i"}, Aliases: []string{"m"},
Usage: "init database", Usage: "migrate database",
Action: wrap(appServer.RunServerInit), Action: wrap(appServer.RunServerMigrate),
}, },
{ {
Name: "runner", Name: "runner",

View File

@ -23,7 +23,7 @@ import (
"time" "time"
) )
func RunServerInit(i *do.Injector) error { func RunServerMigrate(i *do.Injector) error {
slog := do.MustInvoke[log.Service](i).GetLogger("app.server") slog := do.MustInvoke[log.Service](i).GetLogger("app.server")
// Migrate and shutdown database // Migrate and shutdown database

View File

@ -7,11 +7,13 @@ import (
"git.0x7f.app/WOJ/woj-server/internal/misc/config" "git.0x7f.app/WOJ/woj-server/internal/misc/config"
"git.0x7f.app/WOJ/woj-server/internal/misc/log" "git.0x7f.app/WOJ/woj-server/internal/misc/log"
"git.0x7f.app/WOJ/woj-server/internal/model" "git.0x7f.app/WOJ/woj-server/internal/model"
"git.0x7f.app/WOJ/woj-server/pkg/utils"
"github.com/samber/do" "github.com/samber/do"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/driver/postgres" "gorm.io/driver/postgres"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/schema" "gorm.io/gorm/schema"
"hash/fnv"
"moul.io/zapgorm2" "moul.io/zapgorm2"
"time" "time"
) )
@ -108,11 +110,34 @@ func (s *service) setup(conf *model.Config) {
func (s *service) migrateDatabase() { func (s *service) migrateDatabase() {
s.log.Info("Auto Migrating database...") s.log.Info("Auto Migrating database...")
// Running AutoMigrate concurrently on the same model fails with various race conditions
// https://github.com/go-gorm/gorm/pull/6680
// https://github.com/go-gorm/postgres/pull/224
// Obtain a lock to prevent concurrent AutoMigrate
lockID := func(s string) int64 {
h := fnv.New64a()
_, err := h.Write([]byte(s))
return utils.If(err != nil, int64(0x4242AA55), int64(h.Sum64()))
}("gorm:migrator")
s.err = s.db.Exec("SELECT pg_advisory_lock(?)", lockID).Error
if s.err != nil {
s.log.Error("Failed to obtain lock", zap.Error(s.err))
return
}
_ = s.db.AutoMigrate(&model.User{}) _ = s.db.AutoMigrate(&model.User{})
_ = s.db.AutoMigrate(&model.Problem{}) _ = s.db.AutoMigrate(&model.Problem{})
_ = s.db.AutoMigrate(&model.ProblemVersion{}) _ = s.db.AutoMigrate(&model.ProblemVersion{})
_ = s.db.AutoMigrate(&model.Submission{}) _ = s.db.AutoMigrate(&model.Submission{})
_ = s.db.AutoMigrate(&model.Status{}) _ = s.db.AutoMigrate(&model.Status{})
s.err = s.db.Exec("SELECT pg_advisory_unlock(?)", lockID).Error
if s.err != nil {
s.log.Error("Failed to release lock", zap.Error(s.err))
}
} }
func (s *service) checkAlive(retry int) (*sql.DB, error) { func (s *service) checkAlive(retry int) (*sql.DB, error) {