Merge branch 'master' into stable

Author: alubennikova

README.md

@@ -52,12 +52,13 @@ apt-get install pg-probackup-(10|9.6|9.5)
 #DEB-SRC Packages
 echo "deb-src [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
   /etc/apt/sources.list.d/pg_probackup.list
-```
 
-```shell
 #RPM Centos Packages
 rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
 yum install pg_probackup-(10|9.6|9.5)
+
+#SRPM Centos Packages
+yumdownloader --source pg_probackup-(10|9.6|9.5)
 ```
 
 To compile `pg_probackup`, you must have a PostgreSQL installation and raw source tree. To install `pg_probackup`, execute this in the module's directory:

src/backup.c

@@ -877,33 +877,33 @@ do_backup(time_t start_time)
 static void
 check_server_version(void)
 {
-	PGresult   *res;
-
 	/* confirm server version */
 	server_version = PQserverVersion(backup_conn);
 
+	if (server_version == 0)
+		elog(ERROR, "Unknown server version %d", server_version);
+
+	if (server_version < 100000)
+		sprintf(server_version_str, "%d.%d",
+				server_version / 10000,
+				(server_version / 100) % 100);
+	else
+		sprintf(server_version_str, "%d",
+				server_version / 10000);
+
 	if (server_version < 90500)
 		elog(ERROR,
-			 "server version is %d.%d.%d, must be %s or higher",
-			 server_version / 10000,
-			 (server_version / 100) % 100,
-			 server_version % 100, "9.5");
+			 "server version is %s, must be %s or higher",
+			 server_version_str, "9.5");
 
 	if (from_replica && server_version < 90600)
 		elog(ERROR,
-			 "server version is %d.%d.%d, must be %s or higher for backup from replica",
-			 server_version / 10000,
-			 (server_version / 100) % 100,
-			 server_version % 100, "9.6");
+			 "server version is %s, must be %s or higher for backup from replica",
+			 server_version_str, "9.6");
 
 	/* Do exclusive backup only for PostgreSQL 9.5 */
 	exclusive_backup = server_version < 90600 ||
 		current.backup_mode == BACKUP_MODE_DIFF_PTRACK;
-
-	/* Save server_version to use it in future */
-	res = pgut_execute(backup_conn, "show server_version", 0, NULL, true);
-	StrNCpy(server_version_str, PQgetvalue(res, 0, 0), sizeof(server_version_str));
-	PQclear(res);
 }
 
 /*
@@ -940,7 +940,7 @@ confirm_block_size(const char *name, int blcksz)
 	char	   *endp;
 	int			block_size;
 
-	res = pgut_execute(backup_conn, "SELECT current_setting($1)", 1, &name, true);
+	res = pgut_execute(backup_conn, "SELECT pg_catalog.current_setting($1)", 1, &name, true);
 	if (PQntuples(res) != 1 || PQnfields(res) != 1)
 		elog(ERROR, "cannot get %s: %s", name, PQerrorMessage(backup_conn));
 
@@ -974,13 +974,13 @@ pg_start_backup(const char *label, bool smooth, pgBackup *backup)
 	params[1] = smooth ? "false" : "true";
 	if (!exclusive_backup)
 		res = pgut_execute(conn,
-						   "SELECT pg_start_backup($1, $2, false)",
+						   "SELECT pg_catalog.pg_start_backup($1, $2, false)",
 						   2,
 						   params,
 						   true);
 	else
 		res = pgut_execute(conn,
-						   "SELECT pg_start_backup($1, $2)",
+						   "SELECT pg_catalog.pg_start_backup($1, $2)",
 						   2,
 						   params,
 						   true);
@@ -1038,9 +1038,9 @@ pg_switch_wal(PGconn *conn)
 	PQclear(res);
 
 	if (server_version >= 100000)
-		res = pgut_execute(conn, "SELECT * FROM pg_switch_wal()", 0, NULL, true);
+		res = pgut_execute(conn, "SELECT * FROM pg_catalog.pg_switch_wal()", 0, NULL, true);
 	else
-		res = pgut_execute(conn, "SELECT * FROM pg_switch_xlog()", 0, NULL, true);
+		res = pgut_execute(conn, "SELECT * FROM pg_catalog.pg_switch_xlog()", 0, NULL, true);
 
 	PQclear(res);
 }
@@ -1065,7 +1065,7 @@ pg_ptrack_support(void)
 	PQclear(res_db);
 
 	res_db = pgut_execute(backup_conn,
-						  "SELECT ptrack_version()",
+						  "SELECT pg_catalog.ptrack_version()",
 						  0, NULL, true);
 	if (PQntuples(res_db) == 0)
 	{
@@ -1125,7 +1125,7 @@ pg_is_in_recovery(void)
 {
 	PGresult   *res_db;
 
-	res_db = pgut_execute(backup_conn, "SELECT pg_is_in_recovery()", 0, NULL, true);
+	res_db = pgut_execute(backup_conn, "SELECT pg_catalog.pg_is_in_recovery()", 0, NULL, true);
 
 	if (PQgetvalue(res_db, 0, 0)[0] == 't')
 	{
@@ -1164,11 +1164,11 @@ pg_ptrack_clear(void)
 		tblspcOid = atoi(PQgetvalue(res_db, i, 2));
 
 		tmp_conn = pgut_connect(dbname);
-		res = pgut_execute(tmp_conn, "SELECT pg_ptrack_clear()", 0, NULL, true);
+		res = pgut_execute(tmp_conn, "SELECT pg_catalog.pg_ptrack_clear()", 0, NULL, true);
 
 		sprintf(params[0], "%i", dbOid);
 		sprintf(params[1], "%i", tblspcOid);
-		res = pgut_execute(tmp_conn, "SELECT pg_ptrack_get_and_clear_db($1, $2)",
+		res = pgut_execute(tmp_conn, "SELECT pg_catalog.pg_ptrack_get_and_clear_db($1, $2)",
 						   2, (const char **)params, true);
 		PQclear(res);
 
@@ -1215,7 +1215,7 @@ pg_ptrack_get_and_clear_db(Oid dbOid, Oid tblspcOid)
 
 	sprintf(params[0], "%i", dbOid);
 	sprintf(params[1], "%i", tblspcOid);
-	res = pgut_execute(backup_conn, "SELECT pg_ptrack_get_and_clear_db($1, $2)",
+	res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_ptrack_get_and_clear_db($1, $2)",
 						2, (const char **)params, true);
 
 	if (PQnfields(res) != 1)
@@ -1276,7 +1276,7 @@ pg_ptrack_get_and_clear(Oid tablespace_oid, Oid db_oid, Oid rel_filenode,
 		tmp_conn = pgut_connect(dbname);
 		sprintf(params[0], "%i", tablespace_oid);
 		sprintf(params[1], "%i", rel_filenode);
-		res = pgut_execute(tmp_conn, "SELECT pg_ptrack_get_and_clear($1, $2)",
+		res = pgut_execute(tmp_conn, "SELECT pg_catalog.pg_ptrack_get_and_clear($1, $2)",
 						   2, (const char **)params, true);
 
 		if (PQnfields(res) != 1)
@@ -1294,7 +1294,7 @@ pg_ptrack_get_and_clear(Oid tablespace_oid, Oid db_oid, Oid rel_filenode,
 		 */
 		sprintf(params[0], "%i", tablespace_oid);
 		sprintf(params[1], "%i", rel_filenode);
-		res = pgut_execute(backup_conn, "SELECT pg_ptrack_get_and_clear($1, $2)",
+		res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_ptrack_get_and_clear($1, $2)",
 						   2, (const char **)params, true);
 
 		if (PQnfields(res) != 1)
@@ -1475,10 +1475,10 @@ 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_last_wal_replay_lsn()",
+				res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_wal_replay_lsn()",
 								   0, NULL, true);
 			else
-				res = pgut_execute(backup_conn, "SELECT pg_last_xlog_replay_location()",
+				res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_xlog_replay_location()",
 								   0, NULL, true);
 		}
 		/*
@@ -1488,10 +1488,10 @@ wait_replica_wal_lsn(XLogRecPtr lsn, bool is_start_backup)
 		else
 		{
 			if (server_version >= 100000)
-				res = pgut_execute(backup_conn, "SELECT pg_last_wal_receive_lsn()",
+				res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_wal_receive_lsn()",
 								   0, NULL, true);
 			else
-				res = pgut_execute(backup_conn, "SELECT pg_last_xlog_receive_location()",
+				res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_xlog_receive_location()",
 								   0, NULL, true);
 		}
 
@@ -1575,7 +1575,7 @@ pg_stop_backup(pgBackup *backup)
 					 base36enc(backup->start_time));
 		params[0] = name;
 
-		res = pgut_execute(conn, "SELECT pg_create_restore_point($1)",
+		res = pgut_execute(conn, "SELECT pg_catalog.pg_create_restore_point($1)",
 						   1, params, true);
 		PQclear(res);
 	}
@@ -1600,22 +1600,22 @@ pg_stop_backup(pgBackup *backup)
 			 */
 			sent = pgut_send(conn,
 								"SELECT"
-								" txid_snapshot_xmax(txid_current_snapshot()),"
+								" pg_catalog.txid_snapshot_xmax(pg_catalog.txid_current_snapshot()),"
 								" current_timestamp(0)::timestamptz,"
 								" lsn,"
 								" labelfile,"
 								" spcmapfile"
-								" FROM pg_stop_backup(false)",
+								" FROM pg_catalog.pg_stop_backup(false)",
 								0, NULL, WARNING);
 		}
 		else
 		{
 
 			sent = pgut_send(conn,
 								"SELECT"
-								" txid_snapshot_xmax(txid_current_snapshot()),"
+								" pg_catalog.txid_snapshot_xmax(pg_catalog.txid_current_snapshot()),"
 								" current_timestamp(0)::timestamptz,"
-								" pg_stop_backup() as lsn",
+								" pg_catalog.pg_stop_backup() as lsn",
 								0, NULL, WARNING);
 		}
 		pg_stop_backup_is_sent = true;
@@ -2118,8 +2118,8 @@ parse_backup_filelist_filenames(parray *files, const char *root)
 			continue;
 		}
 
-		/* Check files located inside database directories */
-		if (filename[0] != '\0' && file->dbOid != 0)
+		/* Check files located inside database directories including directory 'global' */
+		if (filename[0] != '\0' && file->tblspcOid != 0)
 		{
 			if (strcmp(filename, "pg_internal.init") == 0)
 			{
@@ -2679,7 +2679,7 @@ get_last_ptrack_lsn(void)
 	uint32		xrecoff;
 	XLogRecPtr	lsn;
 
-	res = pgut_execute(backup_conn, "select pg_ptrack_control_lsn()", 0, NULL, true);
+	res = pgut_execute(backup_conn, "select pg_catalog.pg_ptrack_control_lsn()", 0, NULL, true);
 
 	/* Extract timeline and LSN from results of pg_start_backup() */
 	XLogDataFromLSN(PQgetvalue(res, 0, 0), &xlogid, &xrecoff);
@@ -2727,7 +2727,7 @@ pg_ptrack_get_block(backup_files_args *arguments,
 	//elog(LOG, "db %i pg_ptrack_get_block(%i, %i, %u)",dbOid, tblsOid, relOid, blknum);
 	res = pgut_execute_parallel(arguments->thread_backup_conn,
 								arguments->thread_cancel_conn,
-					"SELECT pg_ptrack_get_block_2($1, $2, $3, $4)",
+					"SELECT pg_catalog.pg_ptrack_get_block_2($1, $2, $3, $4)",
 					4, (const char **)params, true);
 
 	if (PQnfields(res) != 1)
@@ -2755,4 +2755,4 @@ pg_ptrack_get_block(backup_files_args *arguments,
 	pfree(params[3]);
 
 	return result;
-}
+}

src/data.c

@@ -602,7 +602,9 @@ restore_data_file(const char *from_root,
 			 * Backup contains information that this block was truncated.
 			 * Truncate file to this length.
 			 */
-			ftruncate(fileno(out), header.block * BLCKSZ);
+			if (ftruncate(fileno(out), header.block * BLCKSZ) != 0)
+				elog(ERROR, "cannot truncate \"%s\": %s",
+					 file->path, strerror(errno));
 			elog(VERBOSE, "truncate file %s to block %u", file->path, header.block);
 			break;
 		}

src/fetch.c

@@ -95,7 +95,7 @@ fetchFile(PGconn *conn, const char *filename, size_t *filesize)
 	int			len;
 
 	params[0] = filename;
-	res = pgut_execute(conn, "SELECT pg_read_binary_file($1)",
+	res = pgut_execute(conn, "SELECT pg_catalog.pg_read_binary_file($1)",
 					   1, params, false);
 
 	/* sanity check the result set */

src/pg_probackup.c

@@ -17,7 +17,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-const char *PROGRAM_VERSION	= "2.0.15";
+const char *PROGRAM_VERSION	= "2.0.16";
 const char *PROGRAM_URL		= "https://github.com/postgrespro/pg_probackup";
 const char *PROGRAM_EMAIL	= "https://github.com/postgrespro/pg_probackup/issues";
 
@@ -176,7 +176,7 @@ static pgut_option options[] =
 int
 main(int argc, char *argv[])
 {
-	char	   *command;
+	char	   *command = NULL;
 	char		path[MAXPGPATH];
 	/* Check if backup_path is directory. */
 	struct stat stat_buf;
@@ -253,22 +253,29 @@ main(int argc, char *argv[])
 	 * Make command string before getopt_long() will call. It permutes the
 	 * content of argv.
 	 */
-	if (backup_subcmd == BACKUP)
+	if (backup_subcmd == BACKUP ||
+		backup_subcmd == RESTORE ||
+		backup_subcmd == VALIDATE ||
+		backup_subcmd == DELETE)
 	{
 		int			i,
-					len = 0;
+					len = 0,
+					allocated = 0;
 
-		command = (char *) palloc(sizeof(char) * MAXPGPATH);
-		command[0] = '\0';
+		allocated = sizeof(char) * MAXPGPATH;
+		command = (char *) palloc(allocated);
 
 		for (i = 0; i < argc; i++)
 		{
 			int			arglen = strlen(argv[i]);
 
-			if (arglen + len > MAXPGPATH)
-				break;
+			if (arglen + len > allocated)
+			{
+				allocated *= 2;
+				command = repalloc(command, allocated);
+			}
 
-			strncpy((command +len), argv[i], arglen);
+			strncpy(command + len, argv[i], arglen);
 			len += arglen;
 			command[len++] = ' ';
 		}
@@ -303,6 +310,18 @@ main(int argc, char *argv[])
 	if (rc != -1 && !S_ISDIR(stat_buf.st_mode))
 		elog(ERROR, "-B, --backup-path must be a path to directory");
 
+	/* Initialize logger */
+	init_logger(backup_path);
+
+	/* command was initialized for a few commands */
+	if (command)
+	{
+		elog_file(INFO, "command: %s", command);
+
+		pfree(command);
+		command = NULL;
+	}
+
 	/* Option --instance is required for all commands except init and show */
 	if (backup_subcmd != INIT && backup_subcmd != SHOW && backup_subcmd != VALIDATE)
 	{
@@ -353,9 +372,6 @@ main(int argc, char *argv[])
 	if (pgdata != NULL && !is_absolute_path(pgdata))
 		elog(ERROR, "-D, --pgdata must be an absolute path");
 
-	/* Initialize logger */
-	init_logger(backup_path);
-
 	/* Sanity check of --backup-id option */
 	if (backup_id_string_param != NULL)
 	{
@@ -421,8 +437,7 @@ main(int argc, char *argv[])
 
 				elog(INFO, "Backup start, pg_probackup version: %s, backup ID: %s, backup mode: %s, instance: %s, stream: %s, remote: %s",
 						  PROGRAM_VERSION, base36enc(start_time), backup_mode, instance_name,
-						  current.stream ? "true" : "false", is_remote_backup ? "true" : "false");
-				elog_file(INFO, "command: %s", command);
+						  stream_wal ? "true" : "false", is_remote_backup ? "true" : "false");
 
 				return do_backup(start_time);
 			}

src/restore.c

@@ -106,6 +106,9 @@ do_restore_or_validate(time_t target_backup_id,
 			elog(ERROR, "restore destination is not empty: \"%s\"", pgdata);
 	}
 
+	if (instance_name == NULL)
+		elog(ERROR, "required parameter not specified: --instance");
+
 	rt = parseRecoveryTargetOptions(target_time, target_xid, target_inclusive);
 
 	elog(LOG, "%s begin.", action);