Issue #31: Use UTC time to make backup ID

Author: za-arthur

src/backup.c

@@ -553,7 +553,7 @@ do_backup_instance(void)
 		pg_ptrack_clear();
 
 	/* notify start of backup to PostgreSQL server */
-	time2iso(label, lengthof(label), current.start_time);
+	time2iso(label, lengthof(label), current.start_time, true);
 	strncat(label, " with pg_probackup", lengthof(label) -
 			strlen(" with pg_probackup"));
 	pg_start_backup(label, smooth_checkpoint, &current);

src/catalog.c

@@ -409,17 +409,17 @@ pgBackupWriteControl(FILE *out, pgBackup *backup)
 			(uint32) (backup->stop_lsn >> 32),
 			(uint32) backup->stop_lsn);
 
-	time2iso(timestamp, lengthof(timestamp), backup->start_time);
+	time2iso(timestamp, lengthof(timestamp), backup->start_time, false);
 	fprintf(out, "start-time = '%s'\n", timestamp);
 	if (backup->end_time > 0)
 	{
-		time2iso(timestamp, lengthof(timestamp), backup->end_time);
+		time2iso(timestamp, lengthof(timestamp), backup->end_time, false);
 		fprintf(out, "end-time = '%s'\n", timestamp);
 	}
 	fprintf(out, "recovery-xid = " XID_FMT "\n", backup->recovery_xid);
 	if (backup->recovery_time > 0)
 	{
-		time2iso(timestamp, lengthof(timestamp), backup->recovery_time);
+		time2iso(timestamp, lengthof(timestamp), backup->recovery_time, false);
 		fprintf(out, "recovery-time = '%s'\n", timestamp);
 	}
 

src/delete.c

@@ -257,7 +257,7 @@ pgBackupDeleteFiles(pgBackup *backup)
 	if (backup->status == BACKUP_STATUS_DELETED)
 		return 0;
 
-	time2iso(timestamp, lengthof(timestamp), backup->recovery_time);
+	time2iso(timestamp, lengthof(timestamp), backup->recovery_time, true);
 
 	elog(INFO, "delete: %s %s", base36enc(backup->start_time), timestamp);
 

src/parsexlog.c

@@ -380,7 +380,8 @@ validate_wal(pgBackup *backup,
 	xlogfpath[0] = '\0';
 
 	/* We can restore at least up to the backup end */
-	time2iso(last_timestamp, lengthof(last_timestamp), backup->recovery_time);
+	time2iso(last_timestamp, lengthof(last_timestamp), backup->recovery_time,
+			 true);
 	last_xid = backup->recovery_xid;
 
 	if ((TransactionIdIsValid(target_xid) && target_xid == last_xid)
@@ -430,7 +431,7 @@ validate_wal(pgBackup *backup,
 
 	if (last_time > 0)
 		time2iso(last_timestamp, lengthof(last_timestamp),
-				 timestamptz_to_time_t(last_time));
+				 timestamptz_to_time_t(last_time), true);
 
 	/* There are all needed WAL records */
 	if (all_wal)
@@ -459,8 +460,8 @@ validate_wal(pgBackup *backup,
 				last_timestamp, last_xid);
 
 		if (target_time > 0)
-			time2iso(target_timestamp, lengthof(target_timestamp),
-						target_time);
+			time2iso(target_timestamp, lengthof(target_timestamp), target_time,
+					 true);
 		if (TransactionIdIsValid(target_xid) && target_time != 0)
 			elog(ERROR, "not enough WAL records to time %s and xid " XID_FMT,
 					target_timestamp, target_xid);

src/pg_probackup.h

@@ -521,7 +521,7 @@ extern bool wal_contains_lsn(const char *archivedir, XLogRecPtr target_lsn,
 /* in util.c */
 extern TimeLineID get_current_timeline(bool safe);
 extern void sanityChecks(void);
-extern void time2iso(char *buf, size_t len, time_t time);
+extern void time2iso(char *buf, size_t len, time_t time, bool to_local);
 extern const char *status2str(BackupStatus status);
 extern void remove_trailing_space(char *buf, int comment_mark);
 extern void remove_not_digit(char *buf, size_t len, const char *str);

src/restore.c

@@ -122,7 +122,8 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 		current_backup = (pgBackup *) parray_get(backups, i);
 
 		/* Skip all backups which started after target backup */
-		if (target_backup_id && current_backup->start_time > target_backup_id)
+		if (target_backup_id != INVALID_BACKUP_ID &&
+			current_backup->start_time > target_backup_id)
 			continue;
 
 		/*
@@ -381,7 +382,7 @@ restore_backup(pgBackup *backup)
 			"XLOG_BLCKSZ(%d) is not compatible(%d expected)",
 			backup->wal_block_size, XLOG_BLCKSZ);
 
-	time2iso(timestamp, lengthof(timestamp), backup->start_time);
+	time2iso(timestamp, lengthof(timestamp), backup->start_time, true);
 	elog(LOG, "restoring database from backup %s", timestamp);
 
 	/*

src/show.c

@@ -324,7 +324,8 @@ show_instance_plain(parray *backup_list, bool show_name)
 		char		data_bytes_str[10] = "----";
 
 		if (backup->recovery_time != (time_t) 0)
-			time2iso(timestamp, lengthof(timestamp), backup->recovery_time);
+			time2iso(timestamp, lengthof(timestamp), backup->recovery_time,
+					 true);
 		if (backup->end_time != (time_t) 0)
 			snprintf(duration, lengthof(duration), "%.*lfs",  0,
 					 difftime(backup->end_time, backup->start_time));
@@ -452,12 +453,12 @@ show_instance_json(parray *backup_list)
 				 (uint32) (backup->stop_lsn >> 32), (uint32) backup->stop_lsn);
 		json_add_value(buf, "stop-lsn", lsn, json_level, true);
 
-		time2iso(timestamp, lengthof(timestamp), backup->start_time);
+		time2iso(timestamp, lengthof(timestamp), backup->start_time, true);
 		json_add_value(buf, "start-time", timestamp, json_level, true);
 
 		if (backup->end_time)
 		{
-			time2iso(timestamp, lengthof(timestamp), backup->end_time);
+			time2iso(timestamp, lengthof(timestamp), backup->end_time, true);
 			json_add_value(buf, "end-time", timestamp, json_level, true);
 		}
 
@@ -466,7 +467,8 @@ show_instance_json(parray *backup_list)
 
 		if (backup->recovery_time > 0)
 		{
-			time2iso(timestamp, lengthof(timestamp), backup->recovery_time);
+			time2iso(timestamp, lengthof(timestamp), backup->recovery_time,
+					 true);
 			json_add_value(buf, "recovery-time", timestamp, json_level, true);
 		}
 

src/util.c

@@ -194,31 +194,35 @@ get_data_checksum_version(bool safe)
  * Convert time_t value to ISO-8601 format string
  */
 void
-time2iso(char *buf, size_t len, time_t time)
+time2iso(char *buf, size_t len, time_t time, bool to_local)
 {
 	struct tm  *ptm = gmtime(&time);
 	time_t		gmt = mktime(ptm);
 	time_t		offset;
 
-	ptm = localtime(&time);
-	offset = time - gmt + (ptm->tm_isdst ? 3600 : 0);
+	if (to_local)
+	{
+		char	   *ptr = buf;
 
-	strftime(buf, len, "%Y-%m-%d %H:%M:%S", ptm);
+		ptm = localtime(&time);
+		offset = time - gmt + (ptm->tm_isdst ? 3600 : 0);
 
-	if (offset != 0)
-	{
-		buf += strlen(buf);
-		sprintf(buf, "%c%02d",
+		strftime(ptr, len, "%Y-%m-%d %H:%M:%S", ptm);
+
+		ptr += strlen(ptr);
+		snprintf(ptr, len - (ptr - buf), "%c%02d",
 				(offset >= 0) ? '+' : '-',
 				abs((int) offset) / SECS_PER_HOUR);
 
 		if (abs((int) offset) % SECS_PER_HOUR != 0)
 		{
-			buf += strlen(buf);
-			sprintf(buf, ":%02d",
+			ptr += strlen(ptr);
+			snprintf(ptr, len - (ptr - buf), ":%02d",
 					abs((int) offset % SECS_PER_HOUR) / SECS_PER_MINUTE);
 		}
 	}
+	else
+		strftime(buf, len, "%Y-%m-%d %H:%M:%S+00", ptm);
 }
 
 /* copied from timestamp.c */