fix destination file existance

Author: kulaginm

src/catchup.c

@@ -389,7 +389,7 @@ do_catchup_instance(const char *source_pgdata, const char *dest_pgdata, PGconn *
 	}
 
 	/*
-	 * Make directories before catchup and setup threads at the same time
+	 * Make directories before catchup
 	 */
 	/*
 	 * We iterate over source_filelist and for every directory with parent 'pg_tblspc'
@@ -541,7 +541,11 @@ do_catchup_instance(const char *source_pgdata, const char *dest_pgdata, PGconn *
 	pfilearray_clear_locks(source_filelist);
 
 	/* Sort by size for load balancing */
-	parray_qsort(source_filelist, pgFileCompareSize);
+	parray_qsort(source_filelist, pgFileCompareSizeDesc);
+
+	/* Sort the array for binary search */
+	if (dest_filelist)
+		parray_qsort(dest_filelist, pgFileCompareRelPathWithExternal);
 
 	/* init thread args */
 	threads = (pthread_t *) palloc(sizeof(pthread_t) * num_threads);
@@ -653,9 +657,6 @@ do_catchup_instance(const char *source_pgdata, const char *dest_pgdata, PGconn *
 		stop_backup_result.tablespace_map_content_len = 0;
 	}
 
-	//REVIEW We don't pass a filelist. Please adjust the comment.
-	/* This function will also add list of xlog files
-	 * to the passed filelist */
 	if(wait_WAL_streaming_end(NULL))
 		elog(ERROR, "WAL streaming failed");
 

src/data.c

@@ -717,12 +717,15 @@ catchup_data_file(pgFile *file, const char *from_fullpath, const char *to_fullpa
 	else
 		use_pagemap = true;
 
+	if (use_pagemap)
+		elog(VERBOSE, "Using pagemap for file \"%s\"", file->rel_path);
+
 	/* Remote mode */
 	if (fio_is_remote(FIO_DB_HOST))
 	{
 		rc = fio_copy_pages(to_fullpath, from_fullpath, file,
 							/* send prev backup START_LSN */
-							backup_mode == BACKUP_MODE_DIFF_DELTA &&
+							(backup_mode == BACKUP_MODE_DIFF_DELTA || backup_mode == BACKUP_MODE_DIFF_PTRACK) &&
 							file->exists_in_prev ? prev_backup_start_lsn : InvalidXLogRecPtr,
 							calg, clevel, checksum_version,
 							/* send pagemap if any */
@@ -735,7 +738,7 @@ catchup_data_file(pgFile *file, const char *from_fullpath, const char *to_fullpa
 		/* TODO: stop handling errors internally */
 		rc = copy_pages(to_fullpath, from_fullpath, file,
 						/* send prev backup START_LSN */
-						backup_mode == BACKUP_MODE_DIFF_DELTA &&
+						(backup_mode == BACKUP_MODE_DIFF_DELTA || backup_mode == BACKUP_MODE_DIFF_PTRACK) &&
 						file->exists_in_prev ? prev_backup_start_lsn : InvalidXLogRecPtr,
 						checksum_version, use_pagemap,
 						backup_mode, ptrack_version_num, ptrack_schema);

src/dir.c

@@ -485,6 +485,13 @@ pgFileCompareSize(const void *f1, const void *f2)
 		return 0;
 }
 
+/* Compare two pgFile with their size in descending order */
+int
+pgFileCompareSizeDesc(const void *f1, const void *f2)
+{
+	return -1 * pgFileCompareSize(f1, f2);
+}
+
 static int
 pgCompareString(const void *str1, const void *str2)
 {

src/pg_probackup.h

@@ -1086,6 +1086,7 @@ extern int pgFileCompareRelPathWithExternal(const void *f1, const void *f2);
 extern int pgFileCompareRelPathWithExternalDesc(const void *f1, const void *f2);
 extern int pgFileCompareLinked(const void *f1, const void *f2);
 extern int pgFileCompareSize(const void *f1, const void *f2);
+extern int pgFileCompareSizeDesc(const void *f1, const void *f2);
 extern int pgCompareOid(const void *f1, const void *f2);
 extern void pfilearray_clear_locks(parray *file_list);