Skip to content

Commit c74471a

Browse files
committed
should pull files before pre-restore scripts
Signed-off-by: Avi Deitcher <avi@deitcher.net>
1 parent 6b8025e commit c74471a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

pkg/core/restore.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@ func (e *Executor) Restore(ctx context.Context, opts RestoreOptions) error {
2929
logger.Level = e.Logger.Level
3030

3131
logger.Info("beginning restore")
32-
// execute pre-restore scripts if any
33-
if err := preRestore(ctx, opts.Target.URL()); err != nil {
34-
return fmt.Errorf("error running pre-restore: %v", err)
35-
}
36-
37-
logger.Debugf("restoring via %s protocol, temporary file location %s", opts.Target.Protocol(), tmpRestoreFile)
38-
3932
_, pullSpan := tracer.Start(ctx, "pull file")
4033
pullSpan.SetAttributes(
4134
attribute.String("target", opts.Target.URL()),
@@ -55,6 +48,13 @@ func (e *Executor) Restore(ctx context.Context, opts RestoreOptions) error {
5548
pullSpan.End()
5649
logger.Debugf("completed copying %d bytes", copied)
5750

51+
// execute pre-restore scripts if any
52+
if err := preRestore(ctx, opts.Target.URL()); err != nil {
53+
return fmt.Errorf("error running pre-restore: %v", err)
54+
}
55+
56+
logger.Debugf("restoring via %s protocol, temporary file location %s", opts.Target.Protocol(), tmpRestoreFile)
57+
5858
// successfully download file, now restore it
5959
tmpdir, err := os.MkdirTemp("", "restore")
6060
if err != nil {

0 commit comments

Comments
 (0)