feat: db migrate/rollback - react to shutdown signals
This commit is contained in:
parent
c3d9c7fc3a
commit
f6d0dae6b6
|
@ -39,6 +39,9 @@ var cmdDB = &cli.Command{
|
||||||
Usage: "Migrate database",
|
Usage: "Migrate database",
|
||||||
Flags: dbFlags,
|
Flags: dbFlags,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
|
shutdownSignalCtx, stop := newShutdownSignalContext(c.Context)
|
||||||
|
defer stop()
|
||||||
|
|
||||||
logger := loggerFromCtx(c.Context)
|
logger := loggerFromCtx(c.Context)
|
||||||
|
|
||||||
bunDB, err := newBunDBFromFlags(c)
|
bunDB, err := newBunDBFromFlags(c)
|
||||||
|
@ -46,29 +49,35 @@ var cmdDB = &cli.Command{
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
logger.Debug("closing db connections...")
|
logger.Debug("closing db connections...", slog.Int("db.openConnections", bunDB.Stats().OpenConnections))
|
||||||
if dbCloseErr := bunDB.Close(); dbCloseErr != nil {
|
if dbCloseErr := bunDB.Close(); dbCloseErr != nil {
|
||||||
logger.Warn("couldn't close db connections", slog.Any("error", dbCloseErr))
|
logger.Warn("couldn't close db connections", slog.Any("error", dbCloseErr))
|
||||||
|
} else {
|
||||||
|
logger.Debug("db connections closed")
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
migrator := migrations.NewMigrator(bunDB)
|
migrator := migrations.NewMigrator(bunDB)
|
||||||
|
|
||||||
if err = migrator.Init(c.Context); err != nil {
|
if err = migrator.Init(shutdownSignalCtx); err != nil {
|
||||||
return fmt.Errorf("couldn't init migrator: %w", err)
|
return fmt.Errorf("couldn't init migrator: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = migrator.Lock(c.Context); err != nil {
|
if err = migrator.Lock(shutdownSignalCtx); err != nil {
|
||||||
return fmt.Errorf("couldn't lock db: %w", err)
|
return fmt.Errorf("couldn't lock db: %w", err)
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
logger.Debug("unlocking db...")
|
logger.Debug("unlocking db...")
|
||||||
|
// we use c.Context instead of shutdownSignalCtx here because we still want to unlock the db
|
||||||
|
// even after one of the shutdown signals has been received
|
||||||
if unlockErr := migrator.Unlock(c.Context); unlockErr != nil {
|
if unlockErr := migrator.Unlock(c.Context); unlockErr != nil {
|
||||||
logger.Warn("couldn't unlock db", slog.Any("error", unlockErr))
|
logger.Warn("couldn't unlock db", slog.Any("error", unlockErr))
|
||||||
|
} else {
|
||||||
|
logger.Debug("db unlocked")
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
group, err := migrator.Migrate(c.Context)
|
group, err := migrator.Migrate(shutdownSignalCtx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("migration failed: %w", err)
|
return fmt.Errorf("migration failed: %w", err)
|
||||||
}
|
}
|
||||||
|
@ -92,6 +101,9 @@ var cmdDB = &cli.Command{
|
||||||
Usage: "Rollback the last migration group",
|
Usage: "Rollback the last migration group",
|
||||||
Flags: dbFlags,
|
Flags: dbFlags,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
|
shutdownSignalCtx, stop := newShutdownSignalContext(c.Context)
|
||||||
|
defer stop()
|
||||||
|
|
||||||
logger := loggerFromCtx(c.Context)
|
logger := loggerFromCtx(c.Context)
|
||||||
|
|
||||||
bunDB, err := newBunDBFromFlags(c)
|
bunDB, err := newBunDBFromFlags(c)
|
||||||
|
@ -99,25 +111,31 @@ var cmdDB = &cli.Command{
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
logger.Debug("closing db connections...")
|
logger.Debug("closing db connections...", slog.Int("db.openConnections", bunDB.Stats().OpenConnections))
|
||||||
if dbCloseErr := bunDB.Close(); dbCloseErr != nil {
|
if dbCloseErr := bunDB.Close(); dbCloseErr != nil {
|
||||||
logger.Warn("couldn't close db connections", slog.Any("error", dbCloseErr))
|
logger.Warn("couldn't close db connections", slog.Any("error", dbCloseErr))
|
||||||
|
} else {
|
||||||
|
logger.Debug("db connections closed")
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
migrator := migrations.NewMigrator(bunDB)
|
migrator := migrations.NewMigrator(bunDB)
|
||||||
|
|
||||||
if err = migrator.Lock(c.Context); err != nil {
|
if err = migrator.Lock(shutdownSignalCtx); err != nil {
|
||||||
return fmt.Errorf("couldn't lock db: %w", err)
|
return fmt.Errorf("couldn't lock db: %w", err)
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
logger.Debug("unlocking db...")
|
logger.Debug("unlocking db...")
|
||||||
|
// we use c.Context instead of shutdownSignalCtx here because we still want to unlock the db
|
||||||
|
// even after one of the shutdown signals has been received
|
||||||
if unlockErr := migrator.Unlock(c.Context); unlockErr != nil {
|
if unlockErr := migrator.Unlock(c.Context); unlockErr != nil {
|
||||||
logger.Warn("couldn't unlock db", slog.Any("error", unlockErr))
|
logger.Warn("couldn't unlock db", slog.Any("error", unlockErr))
|
||||||
|
} else {
|
||||||
|
logger.Debug("db unlocked")
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
group, err := migrator.Rollback(c.Context)
|
group, err := migrator.Rollback(shutdownSignalCtx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("couldn't rollback last migration: %w", err)
|
return fmt.Errorf("couldn't rollback last migration: %w", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,6 +28,7 @@ var (
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
|
// watermill has its own logs, so we don't need to add any debug logs here
|
||||||
if closeErr := amqpConn.Close(); closeErr != nil {
|
if closeErr := amqpConn.Close(); closeErr != nil {
|
||||||
logger.Warn("couldn't close amqp connection", slog.Any("error", err))
|
logger.Warn("couldn't close amqp connection", slog.Any("error", err))
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"os"
|
||||||
|
"os/signal"
|
||||||
|
"syscall"
|
||||||
|
)
|
||||||
|
|
||||||
func concatSlices[T any](slices ...[]T) []T {
|
func concatSlices[T any](slices ...[]T) []T {
|
||||||
var totalLen int
|
var totalLen int
|
||||||
|
|
||||||
|
@ -17,3 +24,11 @@ func concatSlices[T any](slices ...[]T) []T {
|
||||||
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var shutdownSignals = []os.Signal{os.Interrupt, syscall.SIGTERM}
|
||||||
|
|
||||||
|
// newShutdownSignalContext returns a copy of the parent context that is marked done
|
||||||
|
// (its Done channel is closed) when one of the shutdownSignals arrives.
|
||||||
|
func newShutdownSignalContext(parent context.Context) (context.Context, context.CancelFunc) {
|
||||||
|
return signal.NotifyContext(parent, shutdownSignals...)
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue