Merge branch '425-diagnostic-logs-for-restore-jobs' into 'master'

agneum · agneum · commit 333ddc95c4b3 · 2022-09-14T00:00:54.000Z
fix(engine): collect diagnostic logs on errors during restore jobs (#425)

Closes #425

See merge request postgres-ai/database-lab!598
diff --git a/engine/internal/retrieval/engine/postgres/logical/restore.go b/engine/internal/retrieval/engine/postgres/logical/restore.go
@@ -232,6 +232,7 @@ func (r *RestoreJob) Run(ctx context.Context) (err error) {
 
 	defer func() {
 		if err != nil {
+			collectDiagnostics(ctx, r.dockerClient, r.restoreContainerName(), r.fsPool.DataDir())
 			tools.PrintContainerLogs(ctx, r.dockerClient, r.restoreContainerName())
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,7 @@ func (r *RestoreJob) Run(ctx context.Context) (err error) {`
`232`	`232`
`233`	`233`	`defer func() {`
`234`	`234`	`if err != nil {`
	`235`	`+ collectDiagnostics(ctx, r.dockerClient, r.restoreContainerName(), r.fsPool.DataDir())`
`235`	`236`	`tools.PrintContainerLogs(ctx, r.dockerClient, r.restoreContainerName())`
`236`	`237`	`}`
`237`	`238`	`}()`