Merge branch 'master' into stable

Author: za-arthur

Makefile

@@ -32,7 +32,7 @@ else
 srchome=$(top_srcdir)
 endif
 
-ifeq ($(MAJORVERSION),10)
+ifeq (,$(filter 9.5 9.6,$(MAJORVERSION)))
 OBJS += src/walmethods.o
 EXTRA_CLEAN += src/walmethods.c src/walmethods.h
 INCLUDES += src/walmethods.h
@@ -64,7 +64,7 @@ src/streamutil.h: $(top_srcdir)/src/bin/pg_basebackup/streamutil.h
 	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_basebackup/streamutil.h $@
 
 
-ifeq ($(MAJORVERSION),10)
+ifeq (,$(filter 9.5 9.6,$(MAJORVERSION)))
 src/walmethods.c: $(top_srcdir)/src/bin/pg_basebackup/walmethods.c
 	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_basebackup/walmethods.c $@
 src/walmethods.h: $(top_srcdir)/src/bin/pg_basebackup/walmethods.h

README.md

@@ -3,12 +3,12 @@
 `pg_probackup` is a utility to manage backup and recovery of PostgreSQL database clusters. It is designed to perform periodic backups of the PostgreSQL instance that enable you to restore the server in case of a failure.
 
 The utility is compatible with:
-* PostgreSQL 9.5, 9.6, 10;
+* PostgreSQL 9.5, 9.6, 10, 11;
 
 `PTRACK` backup support provided via following options:
 * vanilla PostgreSQL compiled with ptrack patch. Currently there are patches for [PostgreSQL 9.6](https://gist.githubusercontent.com/gsmol/5b615c971dfd461c76ef41a118ff4d97/raw/e471251983f14e980041f43bea7709b8246f4178/ptrack_9.6.6_v1.5.patch) and [PostgreSQL 10](https://gist.githubusercontent.com/gsmol/be8ee2a132b88463821021fd910d960e/raw/de24f9499f4f314a4a3e5fae5ed4edb945964df8/ptrack_10.1_v1.5.patch)
-* Postgres Pro Standard 9.5, 9.6
-* Postgres Pro Enterprise
+* Postgres Pro Standard 9.5, 9.6, 10
+* Postgres Pro Enterprise 9.5, 9.6, 10
 
 As compared to other backup solutions, `pg_probackup` offers the following benefits that can help you implement different backup strategies and deal with large amounts of data:
 * Choosing between full and page-level incremental backups to speed up backup and recovery
@@ -97,4 +97,4 @@ Postgres Professional, Moscow, Russia.
 
 ## Credits
 
-`pg_probackup` utility is based on `pg_arman`, that was originally written by NTT and then developed and maintained by Michael Paquier.
+`pg_probackup` utility is based on `pg_arman`, that was originally written by NTT and then developed and maintained by Michael Paquier.

src/backup.c

@@ -650,8 +650,9 @@ do_backup_instance(void)
 		 * reading WAL segments present in archives up to the point
 		 * where this backup has started.
 		 */
-		extractPageMap(arclog_path, prev_backup->start_lsn, current.tli,
-					   current.start_lsn, backup_files_list);
+		extractPageMap(arclog_path, current.tli, xlog_seg_size,
+					   prev_backup->start_lsn, current.start_lsn,
+					   backup_files_list);
 	}
 	else if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)
 	{
@@ -827,6 +828,11 @@ do_backup(time_t start_time)
 
 	current.primary_conninfo = pgut_get_conninfo_string(backup_conn);
 
+#if PG_VERSION_NUM >= 110000
+	if (!RetrieveWalSegSize(backup_conn))
+		elog(ERROR, "Failed to retreive wal_segment_size");
+#endif
+
 	current.compress_alg = compress_alg;
 	current.compress_level = compress_level;
 
@@ -918,8 +924,9 @@ do_backup(time_t start_time)
 	/* compute size of wal files of this backup stored in the archive */
 	if (!current.stream)
 	{
-		current.wal_bytes = XLOG_SEG_SIZE *
-							(current.stop_lsn/XLogSegSize - current.start_lsn/XLogSegSize + 1);
+		current.wal_bytes = xlog_seg_size *
+			(current.stop_lsn / xlog_seg_size -
+			 current.start_lsn / xlog_seg_size + 1);
 	}
 
 	/* Backup is done. Update backup status */
@@ -1142,10 +1149,11 @@ pg_switch_wal(PGconn *conn)
 	res = pgut_execute(conn, "SET client_min_messages = warning;", 0, NULL);
 	PQclear(res);
 
-	if (server_version >= 100000)
-		res = pgut_execute(conn, "SELECT * FROM pg_catalog.pg_switch_wal()", 0, NULL);
-	else
-		res = pgut_execute(conn, "SELECT * FROM pg_catalog.pg_switch_xlog()", 0, NULL);
+#if PG_VERSION_NUM >= 100000
+	res = pgut_execute(conn, "SELECT * FROM pg_catalog.pg_switch_wal()", 0, NULL);
+#else
+	res = pgut_execute(conn, "SELECT * FROM pg_catalog.pg_switch_xlog()", 0, NULL);
+#endif
 
 	PQclear(res);
 }
@@ -1466,10 +1474,10 @@ wait_wal_lsn(XLogRecPtr lsn, bool is_start_lsn, bool wait_prev_segment)
 	tli = get_current_timeline(false);
 
 	/* Compute the name of the WAL file containig requested LSN */
-	XLByteToSeg(lsn, targetSegNo);
+	GetXLogSegNo(lsn, targetSegNo, xlog_seg_size);
 	if (wait_prev_segment)
 		targetSegNo--;
-	XLogFileName(wal_segment, tli, targetSegNo);
+	GetXLogFileName(wal_segment, tli, targetSegNo, xlog_seg_size);
 
 	/*
 	 * In pg_start_backup we wait for 'lsn' in 'pg_wal' directory iff it is
@@ -1535,7 +1543,7 @@ wait_wal_lsn(XLogRecPtr lsn, bool is_start_lsn, bool wait_prev_segment)
 			/*
 			 * A WAL segment found. Check LSN on it.
 			 */
-			if (wal_contains_lsn(wal_segment_dir, lsn, tli))
+			if (wal_contains_lsn(wal_segment_dir, lsn, tli, xlog_seg_size))
 				/* Target LSN was found */
 			{
 				elog(LOG, "Found LSN: %X/%X", (uint32) (lsn >> 32), (uint32) lsn);
@@ -1584,9 +1592,6 @@ wait_replica_wal_lsn(XLogRecPtr lsn, bool is_start_backup)
 
 	while (true)
 	{
-		PGresult   *res;
-		uint32		lsn_hi;
-		uint32		lsn_lo;
 		XLogRecPtr	replica_lsn;
 
 		/*
@@ -1595,32 +1600,32 @@ wait_replica_wal_lsn(XLogRecPtr lsn, bool is_start_backup)
 		 */
 		if (is_start_backup)
 		{
-			if (server_version >= 100000)
-				res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_wal_replay_lsn()",
-								   0, NULL);
-			else
-				res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_xlog_replay_location()",
-								   0, NULL);
+			replica_lsn = get_checkpoint_location(backup_conn);
 		}
 		/*
 		 * For lsn from pg_stop_backup() we need it only to be received by
 		 * replica and fsync()'ed on WAL segment.
 		 */
 		else
 		{
-			if (server_version >= 100000)
-				res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_wal_receive_lsn()",
-								   0, NULL);
-			else
-				res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_xlog_receive_location()",
-								   0, NULL);
-		}
+			PGresult   *res;
+			uint32		lsn_hi;
+			uint32		lsn_lo;
 
-		/* Extract timeline and LSN from result */
-		XLogDataFromLSN(PQgetvalue(res, 0, 0), &lsn_hi, &lsn_lo);
-		/* Calculate LSN */
-		replica_lsn = ((uint64) lsn_hi) << 32 | lsn_lo;
-		PQclear(res);
+#if PG_VERSION_NUM >= 100000
+			res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_wal_receive_lsn()",
+							   0, NULL);
+#else
+			res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_xlog_receive_location()",
+							   0, NULL);
+#endif
+
+			/* Extract LSN from result */
+			XLogDataFromLSN(PQgetvalue(res, 0, 0), &lsn_hi, &lsn_lo);
+			/* Calculate LSN */
+			replica_lsn = ((uint64) lsn_hi) << 32 | lsn_lo;
+			PQclear(res);
+		}
 
 		/* target lsn was replicated */
 		if (replica_lsn >= lsn)
@@ -1948,7 +1953,7 @@ pg_stop_backup(pgBackup *backup)
 
 		elog(LOG, "Getting the Recovery Time from WAL");
 
-		if (!read_recovery_info(xlog_path, backup->tli,
+		if (!read_recovery_info(xlog_path, backup->tli, xlog_seg_size,
 								backup->start_lsn, backup->stop_lsn,
 								&backup->recovery_time, &backup->recovery_xid))
 		{
@@ -2201,7 +2206,8 @@ parse_backup_filelist_filenames(parray *files, const char *root)
 
 				/* Yes, it is */
 				if (sscanf_result == 2 &&
-					strcmp(tmp_rel_path, TABLESPACE_VERSION_DIRECTORY) == 0)
+					strncmp(tmp_rel_path, TABLESPACE_VERSION_DIRECTORY,
+							strlen(TABLESPACE_VERSION_DIRECTORY)) == 0)
 					set_cfs_datafiles(files, root, relative, i);
 			}
 		}
@@ -2555,7 +2561,7 @@ StreamLog(void *arg)
 	/*
 	 * Always start streaming at the beginning of a segment
 	 */
-	startpos -= startpos % XLOG_SEG_SIZE;
+	startpos -= startpos % xlog_seg_size;
 
 	/* Initialize timeout */
 	stream_stop_timeout = 0;

src/catalog.c

@@ -572,23 +572,23 @@ readBackupControlFile(const char *path)
 	pgBackupInit(backup);
 	if (access(path, F_OK) != 0)
 	{
-		elog(WARNING, "control file \"%s\" doesn't exist", path);
+		elog(WARNING, "Control file \"%s\" doesn't exist", path);
 		pgBackupFree(backup);
 		return NULL;
 	}
 
-	parsed_options = pgut_readopt(path, options, WARNING);
+	parsed_options = pgut_readopt(path, options, WARNING, true);
 
 	if (parsed_options == 0)
 	{
-		elog(WARNING, "control file \"%s\" is empty", path);
+		elog(WARNING, "Control file \"%s\" is empty", path);
 		pgBackupFree(backup);
 		return NULL;
 	}
 
 	if (backup->start_time == 0)
 	{
-		elog(WARNING, "invalid ID/start-time, control file \"%s\" is corrupted", path);
+		elog(WARNING, "Invalid ID/start-time, control file \"%s\" is corrupted", path);
 		pgBackupFree(backup);
 		return NULL;
 	}
@@ -607,7 +607,7 @@ readBackupControlFile(const char *path)
 		if (sscanf(start_lsn, "%X/%X", &xlogid, &xrecoff) == 2)
 			backup->start_lsn = (XLogRecPtr) ((uint64) xlogid << 32) | xrecoff;
 		else
-			elog(WARNING, "invalid START_LSN \"%s\"", start_lsn);
+			elog(WARNING, "Invalid START_LSN \"%s\"", start_lsn);
 		free(start_lsn);
 	}
 
@@ -619,7 +619,7 @@ readBackupControlFile(const char *path)
 		if (sscanf(stop_lsn, "%X/%X", &xlogid, &xrecoff) == 2)
 			backup->stop_lsn = (XLogRecPtr) ((uint64) xlogid << 32) | xrecoff;
 		else
-			elog(WARNING, "invalid STOP_LSN \"%s\"", stop_lsn);
+			elog(WARNING, "Invalid STOP_LSN \"%s\"", stop_lsn);
 		free(stop_lsn);
 	}
 
@@ -644,7 +644,7 @@ readBackupControlFile(const char *path)
 		else if (strcmp(status, "CORRUPT") == 0)
 			backup->status = BACKUP_STATUS_CORRUPT;
 		else
-			elog(WARNING, "invalid STATUS \"%s\"", status);
+			elog(WARNING, "Invalid STATUS \"%s\"", status);
 		free(status);
 	}