code cleanup: remove unneeded backuped variable

alubennikova · alubennikova · commit 19c30a89978e · 2019-06-14T11:58:33.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -429,7 +429,6 @@ do_backup_instance(PGconn *backup_conn)
 			}
 			else
 				join_path_components(dirpath, database_path, dir_name);
-			file->backuped = true;
 			fio_mkdir(dirpath, DIR_PERMISSION, FIO_BACKUP_HOST);
 		}
 
@@ -443,6 +442,11 @@ do_backup_instance(PGconn *backup_conn)
 	if (prev_backup_filelist)
 		parray_qsort(prev_backup_filelist, pgFileComparePathWithExternal);
 
+	/* write initial backup_content.control file and update backup.control  */
+	write_backup_filelist(&current, backup_files_list,
+						  instance_config.pgdata, external_dirs);
+	write_backup(&current);
+
 	/* init thread args with own file lists */
 	threads = (pthread_t *) palloc(sizeof(pthread_t) * num_threads);
 	threads_args = (backup_files_arg *) palloc(sizeof(backup_files_arg)*num_threads);
@@ -1797,7 +1801,6 @@ pg_stop_backup(pgBackup *backup, PGconn *pg_startbackup_conn)
 				file->crc = pgFileGetCRC(file->path, true, false,
 										 &file->read_size, FIO_BACKUP_HOST);
 				file->write_size = file->read_size;
-				file->backuped = true;
 				free(file->path);
 				file->path = strdup(PG_BACKUP_LABEL_FILE);
 				parray_append(backup_files_list, file);
@@ -1846,7 +1849,6 @@ pg_stop_backup(pgBackup *backup, PGconn *pg_startbackup_conn)
 					file->crc = pgFileGetCRC(file->path, true, false,
 											 &file->read_size, FIO_BACKUP_HOST);
 					file->write_size = file->read_size;
-					file->backuped = true;
 				}
 				free(file->path);
 				file->path = strdup(PG_TABLESPACE_MAP_FILE);
@@ -1995,7 +1997,7 @@ backup_files(void *arg)
 			{
 				prev_time = time(NULL);
 
-				write_backup_filelist(&current, arguments->files_list, instance_config.pgdata,
+				write_backup_filelist(&current, arguments->files_list, arguments->from_root,
 									  arguments->external_dirs);
 				/* update backup control file to update size info */
 				write_backup(&current);
@@ -2134,7 +2136,6 @@ backup_files(void *arg)
 				}
 			}
 
-			file->backuped = true;
 			elog(VERBOSE, "File \"%s\". Copied "INT64_FORMAT " bytes",
 				 file->path, file->write_size);
 		}
diff --git a/src/catalog.c b/src/catalog.c
@@ -660,16 +660,11 @@ write_backup_filelist(pgBackup *backup, parray *files, const char *root,
 
 		i++;
 
-		/* if file is not backuped yet, do not add it to the list */
-		/* TODO check that we correctly handle files which disappeared during backups */
-		if (!file->backuped)
-			continue;
-
 		if (S_ISDIR(file->mode))
 			backup_size_on_disk += 4096;
 
 		/* Count the amount of the data actually copied */
-		if (S_ISREG(file->mode))
+		if (S_ISREG(file->mode) && file->write_size > 0)
 			backup_size_on_disk += file->write_size;
 
 		if (file->external_dir_num && external_list)
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
@@ -146,9 +146,6 @@ typedef struct pgFile
 	datapagemap_t pagemap;	/* bitmap of pages updated since previous backup */
 	bool	pagemap_isabsent; /* Used to mark files with unknown state of pagemap,
 							   * i.e. datafiles without _ptrack */
-
-	/* state during bakup */
-	bool backuped; /* is file already completely copied into destination backup? */
 } pgFile;
 
 /* Special values of datapagemap_t bitmapsize */
