From 2ad390d5c96d8352d08f76913be6ae839a98c5d1 Mon Sep 17 00:00:00 2001 From: akartasov Date: Fri, 11 Aug 2023 14:11:42 +0700 Subject: [PATCH 1/4] verify that dump location exists in the logicalRestore job --- .../retrieval/engine/postgres/logical/restore.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/engine/internal/retrieval/engine/postgres/logical/restore.go b/engine/internal/retrieval/engine/postgres/logical/restore.go index fdc59092f..433b1d1b1 100644 --- a/engine/internal/retrieval/engine/postgres/logical/restore.go +++ b/engine/internal/retrieval/engine/postgres/logical/restore.go @@ -10,6 +10,7 @@ import ( "bytes" "context" "fmt" + "io/fs" "os" "path" "path/filepath" @@ -165,7 +166,18 @@ func (r *RestoreJob) Reload(cfg map[string]interface{}) (err error) { stat, err := os.Stat(r.RestoreOptions.DumpLocation) if err != nil { - return errors.Wrap(err, "dumpLocation not found") + if !errors.Is(err, fs.ErrNotExist) { + return errors.Wrap(err, "dumpLocation not found") + } + + if err := os.MkdirAll(r.RestoreOptions.DumpLocation, 0666); err != nil { + return fmt.Errorf("failed to create a location directory: %w", err) + } + + stat, err = os.Stat(r.RestoreOptions.DumpLocation) + if err != nil { + return fmt.Errorf("failed to get stat of dumpLocation: %w", err) + } } r.isDumpLocationDir = stat.IsDir() -- GitLab From fcc8fedb6232a9cd39e56c6ae58d78d1407f0865 Mon Sep 17 00:00:00 2001 From: Nikolay Samokhvalov Date: Fri, 11 Aug 2023 15:55:20 +0000 Subject: [PATCH 2/4] polish wording --- .../internal/retrieval/engine/postgres/logical/restore.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/internal/retrieval/engine/postgres/logical/restore.go b/engine/internal/retrieval/engine/postgres/logical/restore.go index 433b1d1b1..baf3890e3 100644 --- a/engine/internal/retrieval/engine/postgres/logical/restore.go +++ b/engine/internal/retrieval/engine/postgres/logical/restore.go @@ -167,16 +167,16 @@ func (r *RestoreJob) Reload(cfg map[string]interface{}) (err error) { stat, err := os.Stat(r.RestoreOptions.DumpLocation) if err != nil { if !errors.Is(err, fs.ErrNotExist) { - return errors.Wrap(err, "dumpLocation not found") + return errors.Wrap(err, "dumpLocation not found in filesystem") } if err := os.MkdirAll(r.RestoreOptions.DumpLocation, 0666); err != nil { - return fmt.Errorf("failed to create a location directory: %w", err) + return fmt.Errorf("error creating dumpLocation directory: %w", err) } stat, err = os.Stat(r.RestoreOptions.DumpLocation) if err != nil { - return fmt.Errorf("failed to get stat of dumpLocation: %w", err) + return fmt.Errorf("error retrieving stat of dumpLocation: %w", err) } } -- GitLab From 4a8fc7788d9eab0efe11ba728a24bfb0439078e7 Mon Sep 17 00:00:00 2001 From: Artyom Kartasov Date: Mon, 14 Aug 2023 03:50:49 +0000 Subject: [PATCH 3/4] Apply 1 suggestion(s) to 1 file(s) --- engine/internal/retrieval/engine/postgres/logical/restore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/internal/retrieval/engine/postgres/logical/restore.go b/engine/internal/retrieval/engine/postgres/logical/restore.go index baf3890e3..51b269a82 100644 --- a/engine/internal/retrieval/engine/postgres/logical/restore.go +++ b/engine/internal/retrieval/engine/postgres/logical/restore.go @@ -167,7 +167,7 @@ func (r *RestoreJob) Reload(cfg map[string]interface{}) (err error) { stat, err := os.Stat(r.RestoreOptions.DumpLocation) if err != nil { if !errors.Is(err, fs.ErrNotExist) { - return errors.Wrap(err, "dumpLocation not found in filesystem") + return errors.Wrap(err, "cannot get stats of dumpLocation") } if err := os.MkdirAll(r.RestoreOptions.DumpLocation, 0666); err != nil { -- GitLab From 2434176a49cb4cfdfd5db5ee815f5f33ac04ccc0 Mon Sep 17 00:00:00 2001 From: Nikolay Samokhvalov Date: Mon, 14 Aug 2023 04:11:25 +0000 Subject: [PATCH 4/4] Apply 1 suggestion(s) to 1 file(s) --- engine/internal/retrieval/engine/postgres/logical/restore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/internal/retrieval/engine/postgres/logical/restore.go b/engine/internal/retrieval/engine/postgres/logical/restore.go index 51b269a82..a56dc5ce2 100644 --- a/engine/internal/retrieval/engine/postgres/logical/restore.go +++ b/engine/internal/retrieval/engine/postgres/logical/restore.go @@ -176,7 +176,7 @@ func (r *RestoreJob) Reload(cfg map[string]interface{}) (err error) { stat, err = os.Stat(r.RestoreOptions.DumpLocation) if err != nil { - return fmt.Errorf("error retrieving stat of dumpLocation: %w", err) + return fmt.Errorf("cannot get stats of dumpLocation: %w", err) } } -- GitLab