Merge branch 'pgpro-533'

Author: za-arthur

Makefile

@@ -4,7 +4,8 @@ OBJS = src/backup.o src/catalog.o src/configure.o src/data.o \
 	src/pg_probackup.o src/restore.o src/show.o src/status.o \
 	src/util.o src/validate.o src/datapagemap.o src/parsexlog.o \
 	src/xlogreader.o src/streamutil.o src/receivelog.o \
-	src/archive.o src/utils/parray.o src/utils/pgut.o src/utils/logger.o
+	src/archive.o src/utils/parray.o src/utils/pgut.o src/utils/logger.o \
+	src/utils/json.o
 
 EXTRA_CLEAN = src/datapagemap.c src/datapagemap.h src/xlogreader.c \
 	src/receivelog.c src/receivelog.h src/streamutil.c src/streamutil.h src/logging.h

src/backup.c

@@ -633,7 +633,7 @@ do_backup_instance(void)
 						* For backup from master wait for previous segment.
 						* For backup from replica wait for current segment.
 						*/
-					   !from_replica, backup_files_list);
+					   !current.from_replica, backup_files_list);
 	}
 
 	if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)
@@ -815,11 +815,15 @@ do_backup(time_t start_time)
 	pgut_atexit_push(backup_disconnect, NULL);
 
 	current.primary_conninfo = pgut_get_conninfo_string(backup_conn);
+
+	current.compress_alg = compress_alg;
+	current.compress_level = compress_level;
+
 	/* Confirm data block size and xlog block size are compatible */
 	confirm_block_size("block_size", BLCKSZ);
 	confirm_block_size("wal_block_size", XLOG_BLCKSZ);
 
-	from_replica = pg_is_in_recovery();
+	current.from_replica = pg_is_in_recovery();
 
 	/* Confirm that this server version is supported */
 	check_server_version();
@@ -859,7 +863,7 @@ do_backup(time_t start_time)
 		}
 	}
 
-	if (from_replica)
+	if (current.from_replica)
 	{
 		/* Check master connection options */
 		if (master_host == NULL)
@@ -956,7 +960,7 @@ check_server_version(void)
 			 "server version is %s, must be %s or higher",
 			 server_version_str, "9.5");
 
-	if (from_replica && server_version < 90600)
+	if (current.from_replica && server_version < 90600)
 		elog(ERROR,
 			 "server version is %s, must be %s or higher for backup from replica",
 			 server_version_str, "9.6");
@@ -1061,7 +1065,7 @@ pg_start_backup(const char *label, bool smooth, pgBackup *backup)
 	params[0] = label;
 
 	/* For replica we call pg_start_backup() on master */
-	conn = (from_replica) ? master_conn : backup_conn;
+	conn = (backup->from_replica) ? master_conn : backup_conn;
 
 	/* 2nd argument is 'fast'*/
 	params[1] = smooth ? "false" : "true";
@@ -1112,7 +1116,7 @@ pg_start_backup(const char *label, bool smooth, pgBackup *backup)
 	}
 
 	/* Wait for start_lsn to be replayed by replica */
-	if (from_replica)
+	if (backup->from_replica)
 		wait_replica_wal_lsn(backup->start_lsn, true);
 }
 
@@ -1555,8 +1559,6 @@ wait_replica_wal_lsn(XLogRecPtr lsn, bool is_start_backup)
 {
 	uint32		try_count = 0;
 
-	Assert(from_replica);
-
 	while (true)
 	{
 		PGresult   *res;
@@ -1651,7 +1653,7 @@ pg_stop_backup(pgBackup *backup)
 		elog(FATAL, "backup is not in progress");
 
 	/* For replica we call pg_stop_backup() on master */
-	conn = (from_replica) ? master_conn : backup_conn;
+	conn = (current.from_replica) ? master_conn : backup_conn;
 
 	/* Remove annoying NOTICE messages generated by backend */
 	res = pgut_execute(conn, "SET client_min_messages = warning;",
@@ -1664,7 +1666,7 @@ pg_stop_backup(pgBackup *backup)
 		const char *params[1];
 		char		name[1024];
 
-		if (!from_replica)
+		if (!current.from_replica)
 			snprintf(name, lengthof(name), "pg_probackup, backup_id %s",
 					 base36enc(backup->start_time));
 		else
@@ -1892,7 +1894,7 @@ pg_stop_backup(pgBackup *backup)
 					stream_xlog_path[MAXPGPATH];
 
 		/* Wait for stop_lsn to be received by replica */
-		if (from_replica)
+		if (backup->from_replica)
 			wait_replica_wal_lsn(stop_backup_lsn, false);
 		/*
 		 * Wait for stop_lsn to be archived or streamed.

src/catalog.c

@@ -385,15 +385,17 @@ pgBackupWriteControl(FILE *out, pgBackup *backup)
 
 	fprintf(out, "#Configuration\n");
 	fprintf(out, "backup-mode = %s\n", pgBackupGetBackupMode(backup));
-	fprintf(out, "stream = %s\n", backup->stream?"true":"false");
-	fprintf(out, "compress-alg = %s\n", deparse_compress_alg(compress_alg));
-	fprintf(out, "compress-level = %d\n", compress_level);
-	fprintf(out, "from-replica = %s\n", from_replica?"true":"false");
+	fprintf(out, "stream = %s\n", backup->stream ? "true" : "false");
+	fprintf(out, "compress-alg = %s\n",
+			deparse_compress_alg(backup->compress_alg));
+	fprintf(out, "compress-level = %d\n", backup->compress_level);
+	fprintf(out, "from-replica = %s\n", backup->from_replica ? "true" : "false");
 
 	fprintf(out, "\n#Compatibility\n");
 	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, "program-version = %s\n", PROGRAM_VERSION);
 	if (backup->server_version[0] != '\0')
 		fprintf(out, "server-version = %s\n", backup->server_version);
 
@@ -429,7 +431,7 @@ pgBackupWriteControl(FILE *out, pgBackup *backup)
 	if (backup->data_bytes != BYTES_INVALID)
 		fprintf(out, "data-bytes = " INT64_FORMAT "\n", backup->data_bytes);
 
-	if (backup->data_bytes != BYTES_INVALID)
+	if (backup->wal_bytes != BYTES_INVALID)
 		fprintf(out, "wal-bytes = " INT64_FORMAT "\n", backup->wal_bytes);
 
 	fprintf(out, "status = %s\n", status2str(backup->status));
@@ -475,10 +477,9 @@ readBackupControlFile(const char *path)
 	char	   *stop_lsn = NULL;
 	char	   *status = NULL;
 	char	   *parent_backup = NULL;
-	char	   *compress_alg = NULL;
+	char	   *program_version = NULL;
 	char	   *server_version = NULL;
-	int		   *compress_level;
-	bool	   *from_replica;
+	char	   *compress_alg = NULL;
 
 	pgut_option options[] =
 	{
@@ -495,13 +496,14 @@ readBackupControlFile(const char *path)
 		{'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},
+		{'s', 0, "program-version",		&program_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},
 		{'s', 0, "compress-alg",		&compress_alg, SOURCE_FILE_STRICT},
-		{'u', 0, "compress-level",		&compress_level, SOURCE_FILE_STRICT},
-		{'b', 0, "from-replica",		&from_replica, SOURCE_FILE_STRICT},
+		{'u', 0, "compress-level",		&backup->compress_level, SOURCE_FILE_STRICT},
+		{'b', 0, "from-replica",		&backup->from_replica, SOURCE_FILE_STRICT},
 		{'s', 0, "primary-conninfo",	&backup->primary_conninfo, SOURCE_FILE_STRICT},
 		{0}
 	};
@@ -571,13 +573,23 @@ readBackupControlFile(const char *path)
 		free(parent_backup);
 	}
 
+	if (program_version)
+	{
+		StrNCpy(backup->program_version, program_version,
+				sizeof(backup->program_version));
+		pfree(program_version);
+	}
+
 	if (server_version)
 	{
 		StrNCpy(backup->server_version, server_version,
 				sizeof(backup->server_version));
 		pfree(server_version);
 	}
 
+	if (compress_alg)
+		backup->compress_alg = parse_compress_alg(compress_alg);
+
 	return backup;
 }
 
@@ -626,6 +638,48 @@ deparse_backup_mode(BackupMode mode)
 	return NULL;
 }
 
+CompressAlg
+parse_compress_alg(const char *arg)
+{
+	size_t		len;
+
+	/* Skip all spaces detected */
+	while (isspace((unsigned char)*arg))
+		arg++;
+	len = strlen(arg);
+
+	if (len == 0)
+		elog(ERROR, "compress algrorithm is empty");
+
+	if (pg_strncasecmp("zlib", arg, len) == 0)
+		return ZLIB_COMPRESS;
+	else if (pg_strncasecmp("pglz", arg, len) == 0)
+		return PGLZ_COMPRESS;
+	else if (pg_strncasecmp("none", arg, len) == 0)
+		return NONE_COMPRESS;
+	else
+		elog(ERROR, "invalid compress algorithm value \"%s\"", arg);
+
+	return NOT_DEFINED_COMPRESS;
+}
+
+const char*
+deparse_compress_alg(int alg)
+{
+	switch (alg)
+	{
+		case NONE_COMPRESS:
+		case NOT_DEFINED_COMPRESS:
+			return "none";
+		case ZLIB_COMPRESS:
+			return "zlib";
+		case PGLZ_COMPRESS:
+			return "pglz";
+	}
+
+	return NULL;
+}
+
 /* free pgBackup object */
 void
 pgBackupFree(void *backup)