minor bugfix: dissapeared during backup files were marked as 'not changed', now such files are removed from backup_list at the end of the backup

Author: gsmolk

src/backup.c

@@ -763,6 +763,19 @@ do_backup_instance(void)
 	else
 		elog(ERROR, "Data files transferring failed");
 
+	/* Remove disappeared during backup files from backup_list */
+	for (i = 0; i < parray_num(backup_files_list); i++)
+	{
+		pgFile	   *tmp_file = (pgFile *) parray_get(backup_files_list, i);
+
+		if (tmp_file->write_size == FILE_NOT_FOUND)
+		{
+			pg_atomic_clear_flag(&tmp_file->lock);
+			pgFileFree(tmp_file);
+			parray_remove(backup_files_list, i);
+		}
+	}
+
 	/* clean previous backup file list */
 	if (prev_backup_filelist)
 	{
@@ -2241,7 +2254,7 @@ backup_files(void *arg)
 				 * If file is not found, this is not en error.
 				 * It could have been deleted by concurrent postgres transaction.
 				 */
-				file->write_size = BYTES_INVALID;
+				file->write_size = FILE_NOT_FOUND;
 				elog(LOG, "File \"%s\" is not found", file->path);
 				continue;
 			}
@@ -2291,7 +2304,9 @@ backup_files(void *arg)
 									  instance_config.compress_alg,
 									  instance_config.compress_level))
 				{
-					file->write_size = BYTES_INVALID;
+					/* disappeared file not to be confused with 'not changed' */
+					if (file->write_size != FILE_NOT_FOUND)
+						file->write_size = BYTES_INVALID;
 					elog(VERBOSE, "File \"%s\" was not copied to backup", file->path);
 					continue;
 				}
@@ -2315,7 +2330,9 @@ backup_files(void *arg)
 				if (skip ||
 					!copy_file(arguments->from_root, arguments->to_root, file))
 				{
-					file->write_size = BYTES_INVALID;
+					/* disappeared file not to be confused with 'not changed' */
+					if (file->write_size != FILE_NOT_FOUND)
+						file->write_size = BYTES_INVALID;
 					elog(VERBOSE, "File \"%s\" was not copied to backup",
 						 file->path);
 					continue;

src/data.c

@@ -564,6 +564,7 @@ backup_data_file(backup_files_arg* arguments,
 		if (errno == ENOENT)
 		{
 			elog(LOG, "File \"%s\" is not found", file->path);
+			file->write_size = FILE_NOT_FOUND;
 			return false;
 		}
 
@@ -946,7 +947,11 @@ copy_file(const char *from_root, const char *to_root, pgFile *file)
 
 		/* maybe deleted, it's not error */
 		if (errno == ENOENT)
+		{
+			elog(LOG, "File \"%s\" is not found", file->path);
+			file->write_size = FILE_NOT_FOUND;
 			return false;
+		}
 
 		elog(ERROR, "cannot open source file \"%s\": %s", file->path,
 			 strerror(errno));

src/pg_probackup.h

@@ -165,7 +165,8 @@ typedef enum ShowFormat
 
 /* special values of pgBackup fields */
 #define INVALID_BACKUP_ID	0    /* backup ID is not provided by user */
-#define BYTES_INVALID		(-1)
+#define BYTES_INVALID		(-1) /* file didn`t changed since previous backup, DELTA backup do not rely on it */
+#define FILE_NOT_FOUND		(-2) /* file disappeared during backup */
 #define BLOCKNUM_INVALID	(-1)
 
 /*