merge: honor the --no-fsync and --no-validate flags

Author: gsmolk

src/pg_probackup.c

@@ -128,6 +128,10 @@ bool 		compress_shortcut = false;
 /* other options */
 char	   *instance_name;
 
+/* TODO: quick hack */
+bool merge_no_validate = false;
+bool merge_no_sync = false;
+
 /* archive push options */
 int		batch_size = 1;
 static char *wal_file_path;
@@ -830,6 +834,9 @@ main(int argc, char *argv[])
 		case SHOW_CMD:
 			return do_show(instance_name, current.backup_id, show_archive);
 		case DELETE_CMD:
+			merge_no_validate = no_validate;
+			merge_no_sync = no_sync;
+
 			if (delete_expired && backup_id_string)
 				elog(ERROR, "You cannot specify --delete-expired and (-i, --backup-id) options together");
 			if (merge_expired && backup_id_string)
@@ -850,6 +857,8 @@ main(int argc, char *argv[])
 					do_delete(current.backup_id);
 			break;
 		case MERGE_CMD:
+			merge_no_validate = no_validate;
+			merge_no_sync = no_sync;
 			do_merge(current.backup_id);
 			break;
 		case SHOW_CONFIG_CMD:

src/pg_probackup.h

@@ -784,6 +784,10 @@ extern bool		compress_shortcut;
 /* other options */
 extern char *instance_name;
 
+/* temp merge options */
+extern bool merge_no_validate;
+extern bool merge_no_sync;
+
 /* show options */
 extern ShowFormat show_format;
 

src/utils/file.c

@@ -1169,6 +1169,9 @@ int fio_sync(char const* path, fio_location location)
 	{
 		int fd;
 
+		if (merge_no_sync)
+			return 0;
+
 		fd = open(path, O_WRONLY | PG_BINARY, FILE_PERMISSIONS);
 		if (fd < 0)
 			return -1;

src/validate.c

@@ -129,6 +129,9 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
 //		dbOid_exclude_list = get_dbOid_exclude_list(backup, files, params->partial_db_list,
 //														params->partial_restore_type);
 
+	if (merge_no_validate)
+		goto skip_validation;
+
 	/* setup threads */
 	for (i = 0; i < parray_num(files); i++)
 	{
@@ -180,6 +183,8 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
 	pfree(threads);
 	pfree(threads_args);
 
+skip_validation:
+
 	/* cleanup */
 	parray_walk(files, pgFileFree);
 	parray_free(files);