Fix MERGE of uncompressed with compressed backups

Author: za-arthur

src/catalog.c

@@ -820,20 +820,6 @@ pgBackupInit(pgBackup *backup)
 	backup->server_version[0] = '\0';
 }
 
-/*
- * Copy backup metadata from **src** into **dst**.
- */
-void
-pgBackupCopy(pgBackup *dst, pgBackup *src)
-{
-	pfree(dst->primary_conninfo);
-
-	memcpy(dst, src, sizeof(pgBackup));
-
-	if (src->primary_conninfo)
-		dst->primary_conninfo = pstrdup(src->primary_conninfo);
-}
-
 /* free pgBackup object */
 void
 pgBackupFree(void *backup)

src/data.c

@@ -829,6 +829,8 @@ restore_data_file(const char *to_path, pgFile *file, bool allow_truncate,
 
 		if (write_header)
 		{
+			/* We uncompressed the page, so its size is BLCKSZ */
+			header.compressed_size = BLCKSZ;
 			if (fwrite(&header, 1, sizeof(header), out) != sizeof(header))
 				elog(ERROR, "cannot write header of block %u of \"%s\": %s",
 					 blknum, file->path, strerror(errno));
@@ -1592,19 +1594,23 @@ check_file_pages(pgFile *file, XLogRecPtr stop_lsn, uint32 checksum_version,
 			if (read_len == 0 && feof(in))
 				break;		/* EOF found */
 			else if (read_len != 0 && feof(in))
-				elog(ERROR,
+				elog(WARNING,
 					 "odd size page found at block %u of \"%s\"",
 					 blknum, file->path);
 			else
-				elog(ERROR, "cannot read header of block %u of \"%s\": %s",
+				elog(WARNING, "cannot read header of block %u of \"%s\": %s",
 					 blknum, file->path, strerror(errno_tmp));
+			return false;
 		}
 
 		COMP_FILE_CRC32(use_crc32c, crc, &header, read_len);
 
 		if (header.block < blknum)
-			elog(ERROR, "backup is broken at file->path %s block %u",
+		{
+			elog(WARNING, "backup is broken at file->path %s block %u",
 				 file->path, blknum);
+			return false;
+		}
 
 		blknum = header.block;
 
@@ -1620,8 +1626,11 @@ check_file_pages(pgFile *file, XLogRecPtr stop_lsn, uint32 checksum_version,
 		read_len = fread(compressed_page.data, 1,
 			MAXALIGN(header.compressed_size), in);
 		if (read_len != MAXALIGN(header.compressed_size))
-			elog(ERROR, "cannot read block %u of \"%s\" read %zu of %d",
+		{
+			elog(WARNING, "cannot read block %u of \"%s\" read %zu of %d",
 				blknum, file->path, read_len, header.compressed_size);
+			return false;
+		}
 
 		COMP_FILE_CRC32(use_crc32c, crc, compressed_page.data, read_len);
 
@@ -1648,11 +1657,13 @@ check_file_pages(pgFile *file, XLogRecPtr stop_lsn, uint32 checksum_version,
 					is_valid = false;
 					continue;
 				}
-				elog(ERROR, "page of file \"%s\" uncompressed to %d bytes. != BLCKSZ",
+				elog(WARNING, "page of file \"%s\" uncompressed to %d bytes. != BLCKSZ",
 					 file->path, uncompressed_size);
+				return false;
 			}
+
 			if (validate_one_page(page.data, file, blknum,
-				stop_lsn, checksum_version) == PAGE_IS_FOUND_AND_NOT_VALID)
+								  stop_lsn, checksum_version) == PAGE_IS_FOUND_AND_NOT_VALID)
 				is_valid = false;
 		}
 		else

src/dir.c

@@ -211,7 +211,7 @@ pgFileInit(const char *path)
 	strcpy(file->path, path);		/* enough buffer size guaranteed */
 
 	/* Get file name from the path */
-	file_name = strrchr(file->path, '/');
+	file_name = last_dir_separator(file->path);
 	if (file_name == NULL)
 		file->name = file->path;
 	else

src/merge.c

@@ -91,7 +91,8 @@ do_merge(time_t backup_id)
 		}
 		else
 		{
-			Assert(dest_backup);
+			if (dest_backup == NULL)
+				elog(ERROR, "Target backup %s was not found", base36enc(backup_id));
 
 			if (backup->start_time != prev_parent)
 				continue;
@@ -335,6 +336,20 @@ merge_backups(pgBackup *to_backup, pgBackup *from_backup)
 		}
 	}
 
+	/*
+	 * Rename FULL backup directory.
+	 */
+	elog(INFO, "Rename %s to %s", to_backup_id, from_backup_id);
+	if (rename(to_backup_path, from_backup_path) == -1)
+		elog(ERROR, "Could not rename directory \"%s\" to \"%s\": %s",
+			 to_backup_path, from_backup_path, strerror(errno));
+
+	/*
+	 * Merging finished, now we can safely update ID of the destination backup.
+	 */
+	to_backup->start_time = from_backup->start_time;
+	write_backup(to_backup);
+
 	/* Cleanup */
 	if (threads)
 	{
@@ -526,6 +541,12 @@ merge_files(void *arg)
 		else
 			copy_file(argument->from_root, argument->to_root, file);
 
+		/*
+		 * We need to save compression algorithm type of the target backup to be
+		 * able to restore in the future.
+		 */
+		file->compress_alg = to_backup->compress_alg;
+
 		if (file->write_size != BYTES_INVALID)
 			elog(LOG, "Moved file \"%s\": " INT64_FORMAT " bytes",
 				 file->path, file->write_size);

src/pg_probackup.h

@@ -476,7 +476,6 @@ extern void pgBackupGetPath2(const pgBackup *backup, char *path, size_t len,
 							 const char *subdir1, const char *subdir2);
 extern int pgBackupCreateDir(pgBackup *backup);
 extern void pgBackupInit(pgBackup *backup);
-extern void pgBackupCopy(pgBackup *dst, pgBackup *src);
 extern void pgBackupFree(void *backup);
 extern int pgBackupCompareId(const void *f1, const void *f2);
 extern int pgBackupCompareIdDesc(const void *f1, const void *f2);