File tree Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -190,6 +190,9 @@ merge_backups(pgBackup *to_backup, pgBackup *from_backup)
190190 merge_time = time (NULL );
191191 elog (INFO , "Merging backup %s with backup %s" , from_backup_id , to_backup_id );
192192
193+ /* It's redundant to check block checksumms during merge */
194+ skip_block_validation = true;
195+
193196 /*
194197 * Validate to_backup only if it is BACKUP_STATUS_OK. If it has
195198 * BACKUP_STATUS_MERGING status then it isn't valid backup until merging
@@ -672,13 +675,13 @@ merge_files(void *arg)
672675 */
673676 file -> compress_alg = to_backup -> compress_alg ;
674677
675- if (file -> write_size != BYTES_INVALID )
676- elog (VERBOSE , "Merged file \"%s\": " INT64_FORMAT " bytes" ,
677- file -> path , file -> write_size );
678- else
678+ if (file -> write_size < 0 )
679679 elog (ERROR , "Merge of file \"%s\" failed. Invalid size: %i" ,
680680 file -> path , BYTES_INVALID );
681681
682+ elog (VERBOSE , "Merged file \"%s\": " INT64_FORMAT " bytes" ,
683+ file -> path , file -> write_size );
684+
682685 /* Restore relative path */
683686 file -> path = prev_file_path ;
684687 }
You can’t perform that action at this time.
0 commit comments