From 808d86d4fc30542d723b1a60c9544f72c27ba718 Mon Sep 17 00:00:00 2001 From: Jean-Marc Andre Date: Sun, 14 Feb 2021 10:24:45 +0100 Subject: [PATCH] Use binary store for postgres backups --- pkg/backup/root.go | 2 +- pkg/restore/root.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/backup/root.go b/pkg/backup/root.go index 5004803..c813036 100644 --- a/pkg/backup/root.go +++ b/pkg/backup/root.go @@ -46,7 +46,7 @@ func BackupPostgres(file string, hostname string, database string, username stri return err } defer os.Remove("/output/.pgpass") - cmd := exec.Command(pg_dumpExec, "--clean", "--create", "--file", file, "--host", hostname, "--dbname", database, "--username", username, "--no-password") + cmd := exec.Command(pg_dumpExec, "--format=custom", "--clean", "--create", "--file", file, "--host", hostname, "--dbname", database, "--username", username, "--no-password") cmd.Env = append(os.Environ(), "PGPASSFILE=/output/.pgpass") output, err := cmd.CombinedOutput() log.V(1).Info("postgres backup output", "output", string(output)) diff --git a/pkg/restore/root.go b/pkg/restore/root.go index f597ce9..105657c 100644 --- a/pkg/restore/root.go +++ b/pkg/restore/root.go @@ -14,6 +14,7 @@ import ( ) var ( + //psqlExec = "/usr/bin/psql" pg_restoreExec = "/usr/bin/pg_restore" logger logr.Logger ) @@ -32,6 +33,7 @@ func RestoreVolume(snapshotId string) error { log.Error(err, "unable to restore volume", "output", string(output)) state = formolv1alpha1.Failure } + log.V(1).Info("restic restore output", "output", string(output)) session.RestoreSessionUpdateTargetStatus(state) return err } @@ -44,7 +46,8 @@ func RestorePostgres(file string, hostname string, database string, username str return err } defer os.Remove("/output/.pgpass") - cmd := exec.Command(pg_restoreExec, "--clean", "--create", "--file", file, "--host", hostname, "--dbname", database, "--username", username, "--no-password") + //cmd := exec.Command(psqlExec, "--file", file, "--host", hostname, "--dbname", database, "--username", username, "--no-password") + cmd := exec.Command(pg_restoreExec, "--format=custom", "--clean", "--host", hostname, "--dbname", database, "--username", username, "--no-password", file) cmd.Env = append(os.Environ(), "PGPASSFILE=/output/.pgpass") output, err := cmd.CombinedOutput() log.V(1).Info("postgres restore output", "output", string(output))