postgres.git / summary / log / commit / refs
commit 3979ff1fc6e9dd7847ff9bb24beb4d03ebe02cef
Author: Magnus Hagander <magnus@hagander.net>
Date: Sat Aug 24 15:11:31 2013 +0000
First released in: 9.4.0, 9.2.5, 9.3.0
Don't crash when pg_xlog is empty and pg_basebackup -x is used
The backup will not work (without a logarchive, and that's the whole
point of -x) in this case, this patch just changes it to throw an
error instead of crashing when this happens.
Noticed and diagnosed by TAKATSUKA Haruka
src/backend/replication/basebackup.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index b4ed64f24ba..2fa1fc03bfc 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -297,6 +297,14 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
}
qsort(walFiles, nWalFiles, sizeof(char *), compareWalFileNames);
+ /*
+ * There must be at least one xlog file in the pg_xlog directory,
+ * since we are doing backup-including-xlog.
+ */
+ if (nWalFiles < 1)
+ ereport(ERROR,
+ (errmsg("could not find any WAL files")));
+
/*
* Sanity check: the first and last segment should cover startptr and
* endptr, with no gaps in between.
[parent: bd5ab4b28745]