Merge branch 'REL_2_5' into REL_2_6

Author: funny-falcon

src/backup.c

@@ -183,9 +183,9 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 			elog(ERROR, "pg_probackup binary version is %s, but backup %s version is %s. "
 						"pg_probackup do not guarantee to be forward compatible. "
 						"Please upgrade pg_probackup binary.",
-						PROGRAM_VERSION, base36enc(prev_backup->start_time), prev_backup->program_version);
+						PROGRAM_VERSION, backup_id_of(prev_backup), prev_backup->program_version);
 
-		elog(INFO, "Parent backup: %s", base36enc(prev_backup->start_time));
+		elog(INFO, "Parent backup: %s", backup_id_of(prev_backup));
 
 		/* Files of previous backup needed by DELTA backup */
 		prev_backup_filelist = get_backup_filelist(prev_backup, true);
@@ -226,7 +226,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 				"It may indicate that we are trying to backup PostgreSQL instance from the past.",
 				(uint32) (current.start_lsn >> 32), (uint32) (current.start_lsn),
 				(uint32) (prev_backup->start_lsn >> 32), (uint32) (prev_backup->start_lsn),
-				base36enc(prev_backup->start_time));
+				backup_id_of(prev_backup));
 
 	/* Update running backup meta with START LSN */
 	write_backup(&current, true);
@@ -603,7 +603,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 				"It may indicate that we are trying to backup PostgreSQL instance from the past.",
 				(uint32) (current.stop_lsn >> 32), (uint32) (current.stop_lsn),
 				(uint32) (prev_backup->stop_lsn >> 32), (uint32) (prev_backup->stop_lsn),
-				base36enc(prev_backup->stop_lsn));
+				backup_id_of(prev_backup));
 
 	/* clean external directories list */
 	if (external_dirs)
@@ -734,7 +734,7 @@ do_backup(InstanceState *instanceState, pgSetBackupParams *set_backup_params,
 			/* don't care about freeing base36enc_dup memory, we exit anyway */
 			elog(ERROR, "Can't assign backup_id from requested start_time (%s), "
 						"this time must be later that backup %s",
-				base36enc_dup(start_time), base36enc_dup(latest_backup_id));
+				base36enc(start_time), base36enc(latest_backup_id));
 
 		current.backup_id = start_time;
 		pgBackupInitDir(&current, instanceState->instance_backup_subdir_path);

src/catalog.c

@@ -152,7 +152,7 @@ write_backup_status(pgBackup *backup, BackupStatus status,
 
 	/* lock backup in exclusive mode */
 	if (!lock_backup(tmp, strict, true))
-		elog(ERROR, "Cannot lock backup %s directory", base36enc(backup->start_time));
+		elog(ERROR, "Cannot lock backup %s directory", backup_id_of(backup));
 
 	write_backup(tmp, strict);
 
@@ -192,7 +192,7 @@ lock_backup(pgBackup *backup, bool strict, bool exclusive)
 
 	join_path_components(lock_file, backup->root_dir, BACKUP_LOCK_FILE);
 
-	rc = grab_excl_lock_file(backup->root_dir, base36enc(backup->start_time), strict);
+	rc = grab_excl_lock_file(backup->root_dir, backup_id_of(backup), strict);
 
 	if (rc == LOCK_FAIL_TIMEOUT)
 		return false;
@@ -257,7 +257,7 @@ lock_backup(pgBackup *backup, bool strict, bool exclusive)
 		 * freed some space on filesystem, thanks to unlinking of BACKUP_RO_LOCK_FILE.
 		 * If somebody concurrently acquired exclusive lock file first, then we should give up.
 		 */
-		if (grab_excl_lock_file(backup->root_dir, base36enc(backup->start_time), strict) == LOCK_FAIL_TIMEOUT)
+		if (grab_excl_lock_file(backup->root_dir, backup_id_of(backup), strict) == LOCK_FAIL_TIMEOUT)
 			return false;
 
 		return true;
@@ -523,7 +523,7 @@ grab_excl_lock_file(const char *root_dir, const char *backup_id, bool strict)
 	}
 
 //	elog(LOG, "Acquired exclusive lock for backup %s after %ds",
-//			base36enc(backup->start_time),
+//			backup_id_of(backup),
 //			LOCK_TIMEOUT - ntries + LOCK_STALE_TIMEOUT - empty_tries);
 
 	return LOCK_OK;
@@ -563,7 +563,7 @@ wait_shared_owners(pgBackup *backup)
         {
             if (interrupted)
                 elog(ERROR, "Interrupted while locking backup %s",
-                    base36enc(backup->start_time));
+                    backup_id_of(backup));
 
             if (encoded_pid == my_pid)
                 break;
@@ -575,10 +575,10 @@ wait_shared_owners(pgBackup *backup)
                 if ((ntries % LOG_FREQ) == 0)
                 {
                     elog(WARNING, "Process %lld is using backup %s in shared mode, and is still running",
-                            (long long)encoded_pid, base36enc(backup->start_time));
+                            (long long)encoded_pid, backup_id_of(backup));
 
                     elog(WARNING, "Waiting %u seconds on lock for backup %s", ntries,
-                            base36enc(backup->start_time));
+                            backup_id_of(backup));
                 }
 
                 sleep(1);
@@ -606,7 +606,7 @@ wait_shared_owners(pgBackup *backup)
     if (ntries <= 0)
     {
         elog(WARNING, "Cannot to lock backup %s in exclusive mode, because process %llu owns shared lock",
-                base36enc(backup->start_time), (long long)encoded_pid);
+                backup_id_of(backup), (long long)encoded_pid);
         return 1;
     }
 
@@ -979,15 +979,15 @@ catalog_get_backup_list(InstanceState *instanceState, time_t requested_backup_id
 
 		if (!backup)
 		{
-			backup = pgut_new(pgBackup);
+			backup = pgut_new0(pgBackup);
 			pgBackupInit(backup);
 			backup->start_time = base36dec(data_ent->d_name);
 		}
-		else if (strcmp(base36enc(backup->start_time), data_ent->d_name) != 0)
+		else if (strcmp(backup_id_of(backup), data_ent->d_name) != 0)
 		{
 			/* TODO there is no such guarantees */
 			elog(WARNING, "backup ID in control file \"%s\" doesn't match name of the backup folder \"%s\"",
-				 base36enc(backup->start_time), backup_conf_path);
+				 backup_id_of(backup), backup_conf_path);
 		}
 
 		backup->root_dir = pgut_strdup(data_path);
@@ -1026,7 +1026,7 @@ catalog_get_backup_list(InstanceState *instanceState, time_t requested_backup_id
 	{
 		pgBackup   *curr = parray_get(backups, i);
 		pgBackup  **ancestor;
-		pgBackup	key;
+		pgBackup	key = {0};
 
 		if (curr->backup_mode == BACKUP_MODE_FULL)
 			continue;
@@ -1202,7 +1202,7 @@ get_backup_filelist(pgBackup *backup, bool strict)
 
 	/* redundant sanity? */
 	if (!files)
-		elog(strict ? ERROR : WARNING, "Failed to get file list for backup %s", base36enc(backup->start_time));
+		elog(strict ? ERROR : WARNING, "Failed to get file list for backup %s", backup_id_of(backup));
 
 	return files;
 }
@@ -1228,7 +1228,7 @@ catalog_lock_backup_list(parray *backup_list, int from_idx, int to_idx, bool str
 		pgBackup   *backup = (pgBackup *) parray_get(backup_list, i);
 		if (!lock_backup(backup, strict, exclusive))
 			elog(ERROR, "Cannot lock backup %s directory",
-				 base36enc(backup->start_time));
+				 backup_id_of(backup));
 	}
 }
 
@@ -1241,7 +1241,6 @@ catalog_get_last_data_backup(parray *backup_list, TimeLineID tli, time_t current
 	int			i;
 	pgBackup   *full_backup = NULL;
 	pgBackup   *tmp_backup = NULL;
-	char 	   *invalid_backup_id;
 
 	/* backup_list is sorted in order of descending ID */
 	for (i = 0; i < parray_num(backup_list); i++)
@@ -1262,7 +1261,7 @@ catalog_get_last_data_backup(parray *backup_list, TimeLineID tli, time_t current
 		return NULL;
 
 	elog(LOG, "Latest valid FULL backup: %s",
-		base36enc(full_backup->start_time));
+		backup_id_of(full_backup));
 
 	/* FULL backup is found, lets find his latest child */
 	for (i = 0; i < parray_num(backup_list); i++)
@@ -1277,20 +1276,14 @@ catalog_get_last_data_backup(parray *backup_list, TimeLineID tli, time_t current
 			{
 				/* broken chain */
 				case ChainIsBroken:
-					invalid_backup_id = base36enc_dup(tmp_backup->parent_backup);
-
 					elog(WARNING, "Backup %s has missing parent: %s. Cannot be a parent",
-						base36enc(backup->start_time), invalid_backup_id);
-					pg_free(invalid_backup_id);
+						backup_id_of(backup), base36enc(tmp_backup->parent_backup));
 					continue;
 
 				/* chain is intact, but at least one parent is invalid */
 				case ChainIsInvalid:
-					invalid_backup_id = base36enc_dup(tmp_backup->start_time);
-
 					elog(WARNING, "Backup %s has invalid parent: %s. Cannot be a parent",
-						base36enc(backup->start_time), invalid_backup_id);
-					pg_free(invalid_backup_id);
+						backup_id_of(backup), backup_id_of(tmp_backup));
 					continue;
 
 				/* chain is ok */
@@ -1309,7 +1302,7 @@ catalog_get_last_data_backup(parray *backup_list, TimeLineID tli, time_t current
 		else
 		{
 			elog(WARNING, "Backup %s has status: %s. Cannot be a parent.",
-				base36enc(backup->start_time), status2str(backup->status));
+				backup_id_of(backup), status2str(backup->status));
 		}
 	}
 
@@ -1395,7 +1388,7 @@ get_multi_timeline_parent(parray *backup_list, parray *tli_list,
 		return NULL;
 	else
 		elog(LOG, "Latest valid full backup: %s, tli: %i",
-			base36enc(ancestor_backup->start_time), ancestor_backup->tli);
+			backup_id_of(ancestor_backup), ancestor_backup->tli);
 
 	/* At this point we found suitable full backup,
 	 * now we must find his latest child, suitable to be
@@ -1908,7 +1901,7 @@ catalog_get_timelines(InstanceState *instanceState, InstanceConfig *instance)
 				{
 					elog(LOG, "Pinned backup %s is ignored for the "
 							"purpose of WAL retention",
-						base36enc(backup->start_time));
+						backup_id_of(backup));
 					continue;
 				}
 
@@ -2094,7 +2087,7 @@ catalog_get_timelines(InstanceState *instanceState, InstanceConfig *instance)
 			elog(LOG, "Archive backup %s to stay consistent "
 							"protect from purge WAL interval "
 							"between %s and %s on timeline %i",
-						base36enc(backup->start_time),
+						backup_id_of(backup),
 						begin_segno_str, end_segno_str, backup->tli);
 
 			if (tlinfo->keep_segments == NULL)
@@ -2303,7 +2296,7 @@ pin_backup(pgBackup	*target_backup, pgSetBackupParams *set_backup_params)
 		if (target_backup->expire_time == 0)
 		{
 			elog(WARNING, "Backup %s is not pinned, nothing to unpin",
-									base36enc(target_backup->start_time));
+									backup_id_of(target_backup));
 			return;
 		}
 		target_backup->expire_time = 0;
@@ -2323,11 +2316,11 @@ pin_backup(pgBackup	*target_backup, pgSetBackupParams *set_backup_params)
 		char	expire_timestamp[100];
 
 		time2iso(expire_timestamp, lengthof(expire_timestamp), target_backup->expire_time, false);
-		elog(INFO, "Backup %s is pinned until '%s'", base36enc(target_backup->start_time),
+		elog(INFO, "Backup %s is pinned until '%s'", backup_id_of(target_backup),
 														expire_timestamp);
 	}
 	else
-		elog(INFO, "Backup %s is unpinned", base36enc(target_backup->start_time));
+		elog(INFO, "Backup %s is unpinned", backup_id_of(target_backup));
 
 	return;
 }
@@ -2347,7 +2340,7 @@ add_note(pgBackup *target_backup, char *note)
 	{
 		target_backup->note = NULL;
 		elog(INFO, "Removing note from backup %s",
-				base36enc(target_backup->start_time));
+				backup_id_of(target_backup));
 	}
 	else
 	{
@@ -2362,7 +2355,7 @@ add_note(pgBackup *target_backup, char *note)
 
 		target_backup->note = note_string;
 		elog(INFO, "Adding note to backup %s: '%s'",
-				base36enc(target_backup->start_time), target_backup->note);
+				backup_id_of(target_backup), target_backup->note);
 	}
 
 	/* Update backup.control */
@@ -2684,7 +2677,7 @@ write_backup_filelist(pgBackup *backup, parray *files, const char *root,
 static pgBackup *
 readBackupControlFile(const char *path)
 {
-	pgBackup   *backup = pgut_new(pgBackup);
+	pgBackup   *backup = pgut_new0(pgBackup);
 	char	   *backup_mode = NULL;
 	char	   *start_lsn = NULL;
 	char	   *stop_lsn = NULL;
@@ -3094,7 +3087,7 @@ find_parent_full_backup(pgBackup *current_backup)
 				 base36enc(base_full_backup->parent_backup));
 		else
 			elog(WARNING, "Failed to find parent FULL backup for %s",
-				 base36enc(current_backup->start_time));
+				 backup_id_of(current_backup));
 		return NULL;
 	}
 

src/data.c

@@ -1298,7 +1298,7 @@ restore_non_data_file(parray *parent_chain, pgBackup *dest_backup,
 			if (!tmp_file)
 			{
 				elog(ERROR, "Failed to locate non-data file \"%s\" in backup %s",
-					dest_file->rel_path, base36enc(tmp_backup->start_time));
+					dest_file->rel_path, backup_id_of(tmp_backup));
 				continue;
 			}
 
@@ -1331,7 +1331,7 @@ restore_non_data_file(parray *parent_chain, pgBackup *dest_backup,
 	if (tmp_file->write_size <= 0)
 		elog(ERROR, "Full copy of non-data file has invalid size: %lli. "
 				"Metadata corruption in backup %s in file: \"%s\"",
-				(long long)tmp_file->write_size, base36enc(tmp_backup->start_time),
+				(long long)tmp_file->write_size, backup_id_of(tmp_backup),
 				to_fullpath);
 
 	/* incremental restore */