Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Goto command support to handle dirty Database state #36

Merged
merged 4 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cmd/migrate/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

const (
// configuration defaults support local development (i.e. "go run ...")
defaultDatabaseDSN = ""

Check failure on line 7 in cmd/migrate/config.go

View workflow job for this annotation

GitHub Actions / lint

const `defaultDatabaseDSN` is unused (unused)
defaultDatabaseDriver = "postgres"

Check failure on line 8 in cmd/migrate/config.go

View workflow job for this annotation

GitHub Actions / lint

const `defaultDatabaseDriver` is unused (unused)
defaultDatabaseAddress = "0.0.0.0:5432"

Check failure on line 9 in cmd/migrate/config.go

View workflow job for this annotation

GitHub Actions / lint

const `defaultDatabaseAddress` is unused (unused)
defaultDatabaseName = ""

Check failure on line 10 in cmd/migrate/config.go

View workflow job for this annotation

GitHub Actions / lint

const `defaultDatabaseName` is unused (unused)
defaultDatabaseUser = "postgres"

Check failure on line 11 in cmd/migrate/config.go

View workflow job for this annotation

GitHub Actions / lint

const `defaultDatabaseUser` is unused (unused)
defaultDatabasePassword = "postgres"

Check failure on line 12 in cmd/migrate/config.go

View workflow job for this annotation

GitHub Actions / lint

const `defaultDatabasePassword` is unused (unused)
defaultDatabaseSSL = "disable"

Check failure on line 13 in cmd/migrate/config.go

View workflow job for this annotation

GitHub Actions / lint

const `defaultDatabaseSSL` is unused (unused)
defaultConfigDirectory = "/cli/config"

Check failure on line 14 in cmd/migrate/config.go

View workflow job for this annotation

GitHub Actions / lint

const `defaultConfigDirectory` is unused (unused)
)

var (
// define flag overrides
flagHelp = pflag.Bool("help", false, "Print usage")

Check failure on line 19 in cmd/migrate/config.go

View workflow job for this annotation

GitHub Actions / lint

var `flagHelp` is unused (unused)
flagVersion = pflag.String("version", Version, "Print version")
flagLoggingVerbose = pflag.Bool("verbose", true, "Print verbose logging")
flagPrefetch = pflag.Uint("prefetch", 10, "Number of migrations to load in advance before executing")
Expand All @@ -35,4 +35,8 @@

flagConfigDirectory = pflag.String("config.source", defaultConfigDirectory, "directory of the configuration file")
flagConfigFile = pflag.String("config.file", "", "configuration file name without extension")

// goto command flags
flagDirty = pflag.Bool("force-dirty-handling", false, "force the handling of dirty database state")
flagMountPath = pflag.String("cache-dir", "", "path to the mounted volume which is used to copy the migration files")
)
17 changes: 15 additions & 2 deletions internal/cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ const (
Use -format option to specify a Go time format string. Note: migrations with the same time cause "duplicate migration version" error.
Use -tz option to specify the timezone that will be used when generating non-sequential migrations (defaults: UTC).
`
gotoUsage = `goto V Migrate to version V`
gotoUsage = `goto V [-force-dirty-handling] [-cache-dir P] Migrate to version V
Use -force-dirty-handling to handle dirty database state
Use -cache-dir to specify the intermediate path P for storing migrations`
upUsage = `up [N] Apply all or N up migrations`
downUsage = `down [N] [-all] Apply all or N down migrations
Use -all to apply all down migrations`
Expand Down Expand Up @@ -262,8 +264,19 @@ Database drivers: `+strings.Join(database.List(), ", ")+"\n", createUsage, gotoU
if err != nil {
log.fatal("error: can't read version argument V")
}
handleDirty := viper.GetBool("force-dirty-handling")
if handleDirty {
destPath := viper.GetString("cache-dir")
if destPath == "" {
log.fatal("error: cache-dir must be specified when force-dirty-handling is set")
}

if err = migrater.WithDirtyStateHandler(sourcePtr, destPath, handleDirty); err != nil {
log.fatalErr(err)
}
}

if err := gotoCmd(migrater, uint(v)); err != nil {
if err = gotoCmd(migrater, uint(v)); err != nil {
log.fatalErr(err)
}

Expand Down
223 changes: 219 additions & 4 deletions migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ package migrate
import (
"errors"
"fmt"
"net/url"
"os"
"path/filepath"
"strconv"
"strings"
"sync"
"time"

Expand Down Expand Up @@ -36,6 +40,9 @@ var (
ErrLockTimeout = errors.New("timeout: can't acquire database lock")
)

// Define a constant for the migration file name
const lastSuccessfulMigrationFile = "lastSuccessfulMigration"

// ErrShortLimit is an error returned when not enough migrations
// can be returned by a source for a given limit.
type ErrShortLimit struct {
Expand Down Expand Up @@ -80,6 +87,21 @@ type Migrate struct {
// LockTimeout defaults to DefaultLockTimeout,
// but can be set per Migrate instance.
LockTimeout time.Duration

// DirtyStateHandler is used to handle dirty state of the database
dirtyStateConf *dirtyStateHandler
}

type dirtyStateHandler struct {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. It seems more a configuration structure than a handler,
  2. dirtyStateHandler.isDirty should be replaced by dirtyStateHandler.enable or something similar since the "dirty" term is already contained in the name of the structure.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I will avoid the stutter and rename

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shan't we rename the structure to use something like Config rather than Handler?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akleinib I have addressed this. is there something I need to fix to resolve this suggestion?

srcScheme string
srcPath string
destScheme string
destPath string
enable bool
}

func (m *Migrate) IsDirtyHandlingEnabled() bool {
return m.dirtyStateConf != nil && m.dirtyStateConf.enable && m.dirtyStateConf.destPath != ""
}

// New returns a new Migrate instance from a source URL and a database URL.
Expand Down Expand Up @@ -114,6 +136,20 @@ func New(sourceURL, databaseURL string) (*Migrate, error) {
return m, nil
}

func (m *Migrate) updateSourceDrv(sourceURL string) error {
sourceName, err := iurl.SchemeFromURL(sourceURL)
if err != nil {
return fmt.Errorf("failed to parse scheme from source URL: %w", err)
}
m.sourceName = sourceName
sourceDrv, err := source.Open(sourceURL)
if err != nil {
return fmt.Errorf("failed to open source, %q: %w", sourceURL, err)
}
m.sourceDrv = sourceDrv
return nil
}

// NewWithDatabaseInstance returns a new Migrate instance from a source URL
// and an existing database instance. The source URL scheme is defined by each driver.
// Use any string that can serve as an identifier during logging as databaseName.
Expand Down Expand Up @@ -182,6 +218,42 @@ func NewWithInstance(sourceName string, sourceInstance source.Driver, databaseNa
return m, nil
}

func (m *Migrate) WithDirtyStateHandler(srcPath, destPath string, isDirty bool) error {
parser := func(path string) (string, string, error) {
var scheme, p string
uri, err := url.Parse(path)
if err != nil {
return "", "", err
}
scheme = uri.Scheme
p = uri.Path
// if no scheme is provided, assume it's a file path
if scheme == "" {
scheme = "file://"
}
return scheme, p, nil
}

sScheme, sPath, err := parser(srcPath)
if err != nil {
return err
}

dScheme, dPath, err := parser(destPath)
if err != nil {
return err
}

m.dirtyStateConf = &dirtyStateHandler{
srcScheme: sScheme,
destScheme: dScheme,
srcPath: sPath,
destPath: dPath,
enable: isDirty,
}
return nil
}

func newCommon() *Migrate {
return &Migrate{
GracefulStop: make(chan bool, 1),
Expand Down Expand Up @@ -215,20 +287,42 @@ func (m *Migrate) Migrate(version uint) error {
if err := m.lock(); err != nil {
return err
}

curVersion, dirty, err := m.databaseDrv.Version()
if err != nil {
return m.unlockErr(err)
}

// if the dirty flag is passed to the 'goto' command, handle the dirty state
if dirty {
return m.unlockErr(ErrDirty{curVersion})
if m.IsDirtyHandlingEnabled() {
if err = m.handleDirtyState(); err != nil {
return m.unlockErr(err)
akleinib marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
// default behavior
return m.unlockErr(ErrDirty{curVersion})
}
}

// Copy migrations to the destination directory,
akleinib marked this conversation as resolved.
Show resolved Hide resolved
// if state was dirty when Migrate was called, we should handle the dirty state first before copying the migrations
if err = m.copyFiles(); err != nil {
return m.unlockErr(err)
}

ret := make(chan interface{}, m.PrefetchMigrations)
go m.read(curVersion, int(version), ret)

return m.unlockErr(m.runMigrations(ret))
if err = m.runMigrations(ret); err != nil {
return m.unlockErr(err)
}
// Success: Clean up and confirm
// Files are cleaned up after the migration is successful
if err = m.cleanupFiles(version); err != nil {
return m.unlockErr(err)
}
// unlock the database
return m.unlock()
}

// Steps looks at the currently active migration version.
Expand Down Expand Up @@ -723,6 +817,7 @@ func (m *Migrate) readDown(from int, limit int, ret chan<- interface{}) {
// to stop execution because it might have received a stop signal on the
// GracefulStop channel.
func (m *Migrate) runMigrations(ret <-chan interface{}) error {
var lastCleanMigrationApplied int
for r := range ret {

if m.stop() {
Expand All @@ -744,6 +839,15 @@ func (m *Migrate) runMigrations(ret <-chan interface{}) error {
if migr.Body != nil {
m.logVerbosePrintf("Read and execute %v\n", migr.LogString())
if err := m.databaseDrv.Run(migr.BufferedBody); err != nil {
if m.dirtyStateConf != nil && m.dirtyStateConf.enable {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot we use IsDirtyHandlingEnabled() here?

// this condition is required if the first migration fails
if lastCleanMigrationApplied == 0 {
lastCleanMigrationApplied = migr.TargetVersion
}
if e := m.handleMigrationFailure(lastCleanMigrationApplied); e != nil {
return multierror.Append(err, e)
}
}
return err
}
}
Expand All @@ -752,7 +856,7 @@ func (m *Migrate) runMigrations(ret <-chan interface{}) error {
if err := m.databaseDrv.SetVersion(migr.TargetVersion, false); err != nil {
return err
}

lastCleanMigrationApplied = migr.TargetVersion
endTime := time.Now()
readTime := migr.FinishedReading.Sub(migr.StartedBuffering)
runTime := endTime.Sub(migr.FinishedReading)
Expand Down Expand Up @@ -979,3 +1083,114 @@ func (m *Migrate) logErr(err error) {
m.Log.Printf("error: %v", err)
}
}

func (m *Migrate) handleDirtyState() error {
// Perform the following actions when the database state is dirty
/*
1. Update the source driver to read the migrations from the mounted volume
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As before regarding mounted volume term used multiple times in this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use cache-dir

2. Read the last successful migration version from the file
3. Set the last successful migration version in the schema_migrations table
4. Delete the last successful migration file
*/
// the source driver should read the migrations from the mounted volume
// as the DB is dirty and last applied migrations to the database are not present in the source path
if err := m.updateSourceDrv(m.dirtyStateConf.destScheme + m.dirtyStateConf.destPath); err != nil {
return err
}
lastSuccessfulMigrationPath := filepath.Join(m.dirtyStateConf.destPath, lastSuccessfulMigrationFile)
lastVersionBytes, err := os.ReadFile(lastSuccessfulMigrationPath)
if err != nil {
return err
}
lastVersionStr := strings.TrimSpace(string(lastVersionBytes))
lastVersion, err := strconv.ParseInt(lastVersionStr, 10, 64)
if err != nil {
return fmt.Errorf("failed to parse last successful migration version: %w", err)
}

// Set the last successful migration version in the schema_migrations table
if err = m.databaseDrv.SetVersion(int(lastVersion), false); err != nil {
return fmt.Errorf("failed to apply last successful migration: %w", err)
}

m.logPrintf("Successfully set last successful migration version: %s on the DB", lastVersionStr)

if err = os.Remove(lastSuccessfulMigrationPath); err != nil {
return err
}

m.logPrintf("Successfully deleted file: %s", lastSuccessfulMigrationPath)
return nil
}

func (m *Migrate) handleMigrationFailure(lastSuccessfulMigration int) error {
if !m.IsDirtyHandlingEnabled() {
return nil
}
lastSuccessfulMigrationPath := filepath.Join(m.dirtyStateConf.destPath, lastSuccessfulMigrationFile)
return os.WriteFile(lastSuccessfulMigrationPath, []byte(strconv.Itoa(lastSuccessfulMigration)), 0644)
}

func (m *Migrate) cleanupFiles(targetVersion uint) error {
if !m.IsDirtyHandlingEnabled() {
return nil
}

files, err := os.ReadDir(m.dirtyStateConf.destPath)
if err != nil {
// If the directory does not exist
return fmt.Errorf("failed to read directory %s: %w", m.dirtyStateConf.destPath, err)
}

for _, file := range files {
fileName := file.Name()
migration, err := source.Parse(fileName)
if err != nil {
return err
}
// Delete file if version is greater than targetVersion
if migration.Version > targetVersion {
if err = os.Remove(filepath.Join(m.dirtyStateConf.destPath, fileName)); err != nil {
m.logErr(fmt.Errorf("failed to delete file %s: %v", fileName, err))
continue
}
m.logPrintf("Migration file: %s removed during cleanup", fileName)
}
}

return nil
}

// copyFiles copies all files from source to destination volume.
func (m *Migrate) copyFiles() error {
// this is the case when the dirty handling is disabled
if !m.IsDirtyHandlingEnabled() {
return nil
}

files, err := os.ReadDir(m.dirtyStateConf.srcPath)
if err != nil {
// If the directory does not exist
return fmt.Errorf("failed to read directory %s: %w", m.dirtyStateConf.srcPath, err)
}
m.logPrintf("Copying files from %s to %s", m.dirtyStateConf.srcPath, m.dirtyStateConf.destPath)
for _, file := range files {
fileName := file.Name()
if source.Regex.MatchString(fileName) {
fileContentBytes, err := os.ReadFile(filepath.Join(m.dirtyStateConf.srcPath, fileName))
if err != nil {
return err
}
info, err := file.Info()
if err != nil {
return err
}
if err = os.WriteFile(filepath.Join(m.dirtyStateConf.destPath, fileName), fileContentBytes, info.Mode().Perm()); err != nil {
return err
}
}
}

m.logPrintf("Successfully Copied files from %s to %s", m.dirtyStateConf.srcPath, m.dirtyStateConf.destPath)
return nil
}
Loading
Loading