From 9c72fc23dc7350300be0f18538eb9691ef058d40 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 16 May 2020 08:42:00 +0100 Subject: [PATCH] Move around --no-tablespaces Turns out, at the moment, this is ineffective when combined with the archive formats, like the custom format in use. Therefore, move it to the pg_restore command, where hopefully it'll work. --- README | 2 +- scripts/guix-data-service-backup-database | 1 - scripts/guix-data-service-create-small-backup | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index aa846c8..44e34de 100644 --- a/README +++ b/README @@ -91,7 +91,7 @@ for a password, at which point enter the password for the database user that you set earlier. #+BEGIN_SRC shell -pg_restore --jobs=4 --user=guix_data_service --host=127.0.0.1 --dbname=guix_data_service guix_data_service_small.dump +pg_restore --jobs=4 --user=guix_data_service --no-tablespaces --host=127.0.0.1 --dbname=guix_data_service guix_data_service_small.dump #+END_SRC ** Set the database paramstring diff --git a/scripts/guix-data-service-backup-database b/scripts/guix-data-service-backup-database index a3a39c0..77fda89 100755 --- a/scripts/guix-data-service-backup-database +++ b/scripts/guix-data-service-backup-database @@ -17,7 +17,6 @@ ionice -p $$ -c 3 || true pg_dump --format=custom --compress=9 --serializable-deferrable \ --no-comments \ - --no-tablespaces \ --username=guix_data_service \ --file="$TEMPORARY_FILE_NAME" \ "$DATABASE_NAME" diff --git a/scripts/guix-data-service-create-small-backup b/scripts/guix-data-service-create-small-backup index 9020f3a..2a84f42 100755 --- a/scripts/guix-data-service-create-small-backup +++ b/scripts/guix-data-service-create-small-backup @@ -32,6 +32,7 @@ psql --no-psqlrc "$URI" --command="CREATE DATABASE $TMP_DATABASE_NAME WITH OWNER URI_FOR_DATABASE="${URI/test/$TMP_DATABASE_NAME}" pg_restore --username=guix_data_service --jobs=8 --dbname="$URI_FOR_DATABASE" \ + --no-tablespaces \ "$BACKUP_DIRECTORY/$DATE/$FULL_BACKUP_NAME" psql -v ON_ERROR_STOP=1 --echo-queries --no-psqlrc "$URI_FOR_DATABASE" -U guix_data_service <