From 2532c4a659eb32527c489d1a65caa080e181dbd0 Mon Sep 17 00:00:00 2001 From: Michael Banck Date: Sun, 26 Feb 2017 17:59:38 +0100 Subject: [PATCH] Reorder tablespaces for non-WAL streaming basebackups. The replication protocol documentation appears to express that the main tablespace is the first to be sent, however, it is actually the last one in order for the WAL files to be appended to it. This makes the backup_label file (which gets prepended to the main tablespace) inconveniently end up in the middle of the basebackup stream if other tablespaces are present. Change this so that the main tablespace is the first to be sent in case no WAL files are requested, ensuring that backup_label is the first file in the stream in this case. --- src/backend/replication/basebackup.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index 09ecc15..ef3c115 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -230,10 +230,16 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir) else statrelpath = pgstat_stat_directory; - /* Add a node for the base directory at the end */ + /* Add a node for the base directory, either at the end or (if + * WAL is not included) at the beginning (if WAL is not + * included). This means the backup_label file is the first + * file to be sent in the latter case. */ ti = palloc0(sizeof(tablespaceinfo)); ti->size = opt->progress ? sendDir(".", 1, true, tablespaces, true) : -1; - tablespaces = lappend(tablespaces, ti); + if (opt->includewal) + tablespaces = lappend(tablespaces, ti); + else + tablespaces = lcons(ti, tablespaces); /* Send tablespace header */ SendBackupHeader(tablespaces); -- 2.1.4