Merge branch 'REL_2_6' into try-merge-2.6

Author: funny-falcon

src/archive.c

@@ -646,7 +646,7 @@ setup_push_filelist(const char *archive_status_dir, const char *first_file,
 
 	/* get list of files from archive_status */
 	status_files = parray_new();
-	dir_list_file(status_files, archive_status_dir, false, false, false, false, true, 0, FIO_DB_HOST);
+	db_list_dir(status_files, archive_status_dir, false, false, 0);
 	parray_qsort(status_files, pgFileCompareName);
 
 	for (i = 0; i < parray_num(status_files); i++)

src/backup.c

@@ -269,8 +269,8 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 	join_path_components(external_prefix, current.root_dir, EXTERNAL_DIR);
 
 	/* list files with the logical path. omit $PGDATA */
-	fio_list_dir(backup_files_list, instance_config.pgdata,
-				 true, true, false, backup_logs, true, 0);
+	db_list_dir(backup_files_list, instance_config.pgdata, true, backup_logs, 0);
+    exclude_files(backup_files_list, backup_logs);
 
 	/*
 	 * Get database_map (name to oid) for use in partial restore feature.
@@ -288,12 +288,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 		{
 			/* External dirs numeration starts with 1.
 			 * 0 value is not external dir */
-			if (fio_is_remote(FIO_DB_HOST))
-				fio_list_dir(backup_files_list, parray_get(external_dirs, i),
-							 false, true, false, false, true, i+1);
-			else
-				dir_list_file(backup_files_list, parray_get(external_dirs, i),
-							  false, true, false, false, true, i+1, FIO_LOCAL_HOST);
+            db_list_dir(backup_files_list, parray_get(external_dirs, i), false, false, i+1);
 		}
 	}
 

src/catalog.c

@@ -1548,8 +1548,7 @@ catalog_get_timelines(InstanceState *instanceState, InstanceConfig *instance)
 	char end_segno_str[MAXFNAMELEN];
 
 	/* read all xlog files that belong to this archive */
-	dir_list_file(xlog_files_list, instanceState->instance_wal_subdir_path,
-				  false, true, false, false, true, 0, FIO_BACKUP_HOST);
+	backup_list_dir(xlog_files_list, instanceState->instance_wal_subdir_path);
 	parray_qsort(xlog_files_list, pgFileCompareName);
 
 	timelineinfos = parray_new();

src/catchup.c

@@ -647,9 +647,9 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
 	if (current.backup_mode != BACKUP_MODE_FULL)
 	{
 		dest_filelist = parray_new();
-		dir_list_file(dest_filelist, dest_pgdata,
-			true, true, false, backup_logs, true, 0, FIO_LOCAL_HOST);
+		db_list_dir(dest_filelist, dest_pgdata, true, backup_logs, 0);
 		filter_filelist(dest_filelist, dest_pgdata, exclude_absolute_paths_list, exclude_relative_paths_list, "Destination");
+        exclude_files(dest_filelist, backup_logs);
 
 		// fill dest_redo.lsn and dest_redo.tli
 		get_redo(FIO_LOCAL_HOST, dest_pgdata, &dest_redo);
@@ -714,12 +714,8 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
 	source_filelist = parray_new();
 
 	/* list files with the logical path. omit $PGDATA */
-	if (fio_is_remote(FIO_DB_HOST))
-		fio_list_dir(source_filelist, source_pgdata,
-					 true, true, false, backup_logs, true, 0);
-	else
-		dir_list_file(source_filelist, source_pgdata,
-					  true, true, false, backup_logs, true, 0, FIO_LOCAL_HOST);
+    db_list_dir(source_filelist, source_pgdata, true, backup_logs, 0);
+    exclude_files(source_filelist, backup_logs);
 
 	//REVIEW FIXME. Let's fix that before release.
 	// TODO what if wal is not a dir (symlink to a dir)?

src/checkdb.c

@@ -207,8 +207,8 @@ do_block_validation(char *pgdata, uint32 checksum_version)
 	files_list = parray_new();
 
 	/* list files with the logical path. omit $PGDATA */
-	dir_list_file(files_list, pgdata, true, true,
-				  false, false, true, 0, FIO_DB_HOST);
+	db_list_dir(files_list, pgdata, true, false, 0);
+    exclude_files(files_list, false);
 
 	/*
 	 * Sort pathname ascending.

src/delete.c

@@ -731,11 +731,7 @@ do_retention_wal(InstanceState *instanceState, bool dry_run)
 void
 delete_backup_files(pgBackup *backup)
 {
-	size_t		i;
 	char		timestamp[100];
-	parray		*files;
-	size_t		num_files;
-	char		full_path[MAXPGPATH];
 
 	/*
 	 * If the backup was deleted already, there is nothing to do.
@@ -761,32 +757,8 @@ delete_backup_files(pgBackup *backup)
 	 */
 	write_backup_status(backup, BACKUP_STATUS_DELETING, false);
 
-	/* list files to be deleted */
-	files = parray_new();
-	dir_list_file(files, backup->root_dir, false, false, true, false, false, 0, FIO_BACKUP_HOST);
-
-	/* delete leaf node first */
-	parray_qsort(files, pgFileCompareRelPathWithExternalDesc);
-	num_files = parray_num(files);
-	for (i = 0; i < num_files; i++)
-	{
-		pgFile	   *file = (pgFile *) parray_get(files, i);
-
-		join_path_components(full_path, backup->root_dir, file->rel_path);
-
-		if (interrupted)
-			elog(ERROR, "interrupted during delete backup");
-
-		if (progress)
-			elog(INFO, "Progress: (%zd/%zd). Delete file \"%s\"",
-				 i + 1, num_files, full_path);
-
-		if (fio_remove(FIO_BACKUP_HOST, full_path, false) != 0)
-			elog(ERROR, "Cannot remove file or directory \"%s\": %s", full_path, strerror(errno));
-	}
-
-	parray_walk(files, pgFileFree);
-	parray_free(files);
+    pioDrive_i drive = pioDriveForLocation(FIO_BACKUP_HOST);
+    $i(pioRemoveDir, drive, .root = backup->root_dir, .root_as_well = true);
 	backup->status = BACKUP_STATUS_DELETED;
 
 	return;