Commit 533288f

committed

Merge branch 'ignore-restore-errors' into 'master'

feat (engine): ignore errors that occurred during logical data dump/restore See merge request postgres-ai/database-lab!699

2 parents a7c31d2 + 18df217 commit 533288fCopy full SHA for 533288f

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,9 @@ retrieval:`
`241`	`241`	`# If your source database has 4 vCPUs or less, and you don't want to saturate them, use 2 or 1.`
`242`	`242`	`parallelJobs: 4`
`243`	`243`
	`244`	`+ # Ignore errors that occurred during logical data dump. Do not ignore by default.`
	`245`	`+ ignoreErrors: false`
	`246`	`+`
`244`	`247`	`# Options for direct restore to Database Lab Engine instance.`
`245`	`248`	`# Uncomment this if you prefer restoring from the dump on the fly. In this case,`
`246`	`249`	`# you do not need to use "logicalRestore" job. Keep in mind that unlike "logicalRestore",`
`@@ -283,6 +286,9 @@ retrieval:`
`283`	`286`	`# Note the existing data will be overwritten.`
`284`	`287`	`forceInit: false`
`285`	`288`
	`289`	`+ # Ignore errors that occurred during logical data restore. Do not ignore by default.`
	`290`	`+ ignoreErrors: false`
	`291`	`+`
`286`	`292`	`# Option to adjust PostgreSQL configuration for a logical restore job`
`287`	`293`	`# It's useful if a restored database contains non-standard extensions.`
`288`	`294`	`<<: *db_configs`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,9 @@ retrieval:`
`238`	`238`	`# If your source database has 4 vCPUs or less, and you don't want to saturate them, use 2 or 1.`
`239`	`239`	`parallelJobs: 4`
`240`	`240`
	`241`	`+ # Ignore errors that occurred during logical data dump. Do not ignore by default.`
	`242`	`+ ignoreErrors: false`
	`243`	`+`
`241`	`244`	`# Options for direct restore to Database Lab Engine instance.`
`242`	`245`	`# Uncomment this if you prefer restoring from the dump on the fly. In this case,`
`243`	`246`	`# you do not need to use "logicalRestore" job. Keep in mind that unlike "logicalRestore",`
`@@ -278,6 +281,9 @@ retrieval:`
`278`	`281`	`# Note the existing data will be overwritten.`
`279`	`282`	`forceInit: false`
`280`	`283`
	`284`	`+ # Ignore errors that occurred during logical data restore. Do not ignore by default.`
	`285`	`+ ignoreErrors: false`
	`286`	`+`
`281`	`287`	`# Option to adjust PostgreSQL configuration for a logical restore job`
`282`	`288`	`# It's useful if a restored database contains non-standard extensions.`
`283`	`289`	`<<: *db_configs`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ type DumpOptions struct {`
`87`	`87`	Source Source `yaml:"source"`
`88`	`88`	Databases map[string]DumpDefinition `yaml:"databases"`
`89`	`89`	ParallelJobs int `yaml:"parallelJobs"`
	`90`	+ IgnoreErrors bool `yaml:"ignoreErrors"`
`90`	`91`	Restore ImmediateRestore `yaml:"immediateRestore"`
`91`	`92`	CustomOptions []string `yaml:"customOptions"`
`92`	`93`	`}`
`@@ -513,7 +514,9 @@ func (d *DumpJob) dumpDatabase(ctx context.Context, dumpContID, dbName string, d`
`513`	`514`	`}); err != nil {`
`514`	`515`	`log.Err("Dump command failed: ", output)`
`515`	`516`
`516`		`- return fmt.Errorf("failed to dump a database: %w. Output: %s", err, output)`
	`517`	`+ if !d.DumpOptions.IgnoreErrors {`
	`518`	`+ return fmt.Errorf("failed to dump a database: %w. Output: %s", err, output)`
	`519`	`+ }`
`517`	`520`	`}`
`518`	`521`
`519`	`522`	`log.Msg(fmt.Sprintf("Dumping job for the database %q has been finished", dbName))`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ type RestoreOptions struct {`
`101`	`101`	ContainerConfig map[string]interface{} `yaml:"containerConfig"`
`102`	`102`	Databases map[string]DumpDefinition `yaml:"databases"`
`103`	`103`	ForceInit bool `yaml:"forceInit"`
	`104`	+ IgnoreErrors bool `yaml:"ignoreErrors"`
`104`	`105`	ParallelJobs int `yaml:"parallelJobs"`
`105`	`106`	Configs map[string]string `yaml:"configs"`
`106`	`107`	QueryPreprocessing query.PreprocessorCfg `yaml:"queryPreprocessing"`
`@@ -519,7 +520,7 @@ func (r *RestoreJob) restoreDB(ctx context.Context, contID, dbName string, dbDef`
`519`	`520`	`Env: []string{"PGAPPNAME=" + dleRetrieval},`
`520`	`521`	`})`
`521`	`522`
`522`		`- if err != nil {`
	`523`	`+ if err != nil &&!r.RestoreOptions.IgnoreErrors{`
`523`	`524`	`log.Err("Restore command failed: ", output)`
`524`	`525`
`525`	`526`	`return fmt.Errorf("failed to exec restore command: %w. Output: %s", err, output)`

Comments

(0)