PGPRO-1059: Add PG version into show output, save server_version in backup.control

Author: za-arthur

src/backup.c

@@ -60,6 +60,7 @@ static PGconn *backup_conn_replication = NULL;
 
 /* PostgreSQL server version from "backup_conn" */
 static int server_version = 0;
+static char server_version_str[100] = "";
 
 static bool exclusive_backup = false;
 /* Is pg_start_backup() was executed */
@@ -782,6 +783,8 @@ do_backup(void)
 	/* TODO fix it for remote backup*/
 	if (!is_remote_backup)
 		current.checksum_version = get_data_checksum_version(true);
+	StrNCpy(current.server_version, server_version_str,
+			sizeof(current.server_version));
 	current.stream = stream_wal;
 
 	is_ptrack_support = pg_ptrack_support();
@@ -887,6 +890,8 @@ do_backup(void)
 static void
 check_server_version(void)
 {
+	PGresult   *res;
+
 	/* confirm server version */
 	server_version = PQserverVersion(backup_conn);
 
@@ -906,6 +911,11 @@ check_server_version(void)
 
 	/* Do exclusive backup only for PostgreSQL 9.5 */
 	exclusive_backup = server_version < 90600;
+
+	/* Save server_version to use it in future */
+	res = pgut_execute(backup_conn, "show server_version", 0, NULL);
+	StrNCpy(server_version_str, PQgetvalue(res, 0, 0), sizeof(server_version_str));
+	PQclear(res);
 }
 
 /*

src/catalog.c

@@ -394,6 +394,7 @@ pgBackupWriteControl(FILE *out, pgBackup *backup)
 	fprintf(out, "block-size = %u\n", backup->block_size);
 	fprintf(out, "xlog-block-size = %u\n", backup->wal_block_size);
 	fprintf(out, "checksum-version = %u\n", backup->checksum_version);
+	fprintf(out, "server-version = %s\n", backup->server_version);
 
 	fprintf(out, "\n#Result backup info\n");
 	fprintf(out, "timelineid = %d\n", backup->tli);
@@ -475,6 +476,7 @@ readBackupControlFile(const char *path)
 	char	   *status = NULL;
 	char	   *parent_backup = NULL;
 	char	   *compress_alg = NULL;
+	char	   *server_version = NULL;
 	int		   *compress_level;
 	bool	   *from_replica;
 
@@ -492,7 +494,8 @@ readBackupControlFile(const char *path)
 		{'I', 0, "wal-bytes",			&backup->wal_bytes, SOURCE_FILE_STRICT},
 		{'u', 0, "block-size",			&backup->block_size, SOURCE_FILE_STRICT},
 		{'u', 0, "xlog-block-size",		&backup->wal_block_size, SOURCE_FILE_STRICT},
-		{'u', 0, "checksum_version",	&backup->checksum_version, SOURCE_FILE_STRICT},
+		{'u', 0, "checksum-version",	&backup->checksum_version, SOURCE_FILE_STRICT},
+		{'s', 0, "server-version",		&server_version, SOURCE_FILE_STRICT},
 		{'b', 0, "stream",				&backup->stream, SOURCE_FILE_STRICT},
 		{'s', 0, "status",				&status, SOURCE_FILE_STRICT},
 		{'s', 0, "parent-backup-id",	&parent_backup, SOURCE_FILE_STRICT},
@@ -565,6 +568,13 @@ readBackupControlFile(const char *path)
 		free(parent_backup);
 	}
 
+	if (server_version)
+	{
+		StrNCpy(backup->server_version, server_version,
+				sizeof(backup->server_version));
+		pfree(server_version);
+	}
+
 	return backup;
 }
 

src/pg_probackup.h

@@ -211,6 +211,8 @@ typedef struct pgBackup
 	uint32			wal_block_size;
 	uint32			checksum_version;
 
+	char			server_version[100];
+
 	bool			stream; 		/* Was this backup taken in stream mode?
 									 * i.e. does it include all needed WAL files? */
 	time_t			parent_backup; 	/* Identifier of the previous backup.

src/show.c

@@ -226,9 +226,9 @@ show_backup_list(FILE *out, parray *backup_list)
 
 	/* if you add new fields here, fix the header */
 	/* show header */
-	fputs("==================================================================================================================================\n", out);
-	fputs(" Instance    ID      Recovery time           Mode    WAL      Current/Parent TLI    Time    Data    Start LSN    Stop LSN   Status\n", out);
-	fputs("==================================================================================================================================\n", out);
+	fputs("============================================================================================================================================\n", out);
+	fputs(" Instance    Version  ID      Recovery time           Mode    WAL      Current/Parent TLI    Time    Data   Start LSN    Stop LSN    Status \n", out);
+	fputs("============================================================================================================================================\n", out);
 
 	for (i = 0; i < parray_num(backup_list); i++)
 	{
@@ -257,8 +257,10 @@ show_backup_list(FILE *out, parray *backup_list)
 		parent_tli = get_parent_tli(backup->tli);
 		backup_id = base36enc(backup->start_time);
 
-		fprintf(out, " %-11s %-6s  %-19s  %-6s  %-7s  %3d / %-3d            %5s  %6s  %2X/%-8X  %2X/%-8X  %-8s\n",
-				instance_name, backup_id,
+		fprintf(out, " %-11s %-8s %-6s  %-19s  %-6s  %-7s  %3d / %-3d            %5s  %6s  %2X/%-8X  %2X/%-8X  %-8s\n",
+				instance_name,
+				(backup->server_version[0] ? backup->server_version : "----"),
+				backup_id,
 				timestamp,
 				pgBackupGetBackupMode(backup),
 				backup->stream ? "STREAM": "ARCHIVE",

src/util.c

@@ -263,4 +263,5 @@ pgBackup_init(pgBackup *backup)
 	backup->wal_block_size = XLOG_BLCKSZ;
 	backup->stream = false;
 	backup->parent_backup = 0;
+	backup->server_version[0] = '\0';
 }