PGPRO-2073: Write program-version only during backup

za-arthur · za-arthur · commit 0b2e0469acf2 · 2018-10-16T18:28:00.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -911,6 +911,8 @@ do_backup(time_t start_time)
 	/* Start backup. Update backup status. */
 	current.status = BACKUP_STATUS_RUNNING;
 	current.start_time = start_time;
+	StrNCpy(current.program_version, PROGRAM_VERSION,
+			sizeof(current.program_version));
 
 	/* Create backup directory and BACKUP_CONTROL_FILE */
 	if (pgBackupCreateDir(&current))
diff --git a/src/catalog.c b/src/catalog.c
@@ -219,17 +219,19 @@ read_backup(time_t timestamp)
 /*
  * Save the backup status into BACKUP_CONTROL_FILE.
  *
- * We need to reread the backup using its ID and save it changing only its status.
+ * We need to reread the backup using its ID and save it changing only its
+ * status.
  */
 void
 write_backup_status(pgBackup *backup)
 {
 	pgBackup   *tmp;
 
 	tmp = read_backup(backup->start_time);
-	tmp->status = backup->status;
 
+	tmp->status = backup->status;
 	write_backup(tmp);
+
 	pgBackupFree(tmp);
 }
 
@@ -443,7 +445,8 @@ 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, "program-version = %s\n", PROGRAM_VERSION);
+	if (backup->program_version[0] != '\0')
+		fprintf(out, "program-version = %s\n", backup->program_version);
 	if (backup->server_version[0] != '\0')
 		fprintf(out, "server-version = %s\n", backup->server_version);
 
@@ -493,17 +496,19 @@ pgBackupWriteControl(FILE *out, pgBackup *backup)
 		fprintf(out, "primary_conninfo = '%s'\n", backup->primary_conninfo);
 }
 
-/* create BACKUP_CONTROL_FILE */
+/*
+ * Save the backup content into BACKUP_CONTROL_FILE.
+ */
 void
 write_backup(pgBackup *backup)
 {
 	FILE   *fp = NULL;
-	char	ini_path[MAXPGPATH];
+	char	conf_path[MAXPGPATH];
 
-	pgBackupGetPath(backup, ini_path, lengthof(ini_path), BACKUP_CONTROL_FILE);
-	fp = fopen(ini_path, "wt");
+	pgBackupGetPath(backup, conf_path, lengthof(conf_path), BACKUP_CONTROL_FILE);
+	fp = fopen(conf_path, "wt");
 	if (fp == NULL)
-		elog(ERROR, "cannot open configuration file \"%s\": %s", ini_path,
+		elog(ERROR, "Cannot open configuration file \"%s\": %s", conf_path,
 			strerror(errno));
 
 	pgBackupWriteControl(fp, backup);
diff --git a/src/utils/pgut.c b/src/utils/pgut.c
@@ -241,7 +241,7 @@ assign_option(pgut_option *opt, const char *optarg, pgut_optsrc src)
 				*(char **) opt->var = pgut_strdup(optarg);
 				if (strcmp(optarg,"") != 0)
 					return;
-				message = "a valid string. But provided: ";
+				message = "a valid string";
 				break;
 			case 't':
 				if (parse_time(optarg, opt->var,
