Version 2.0

Author: alubennikova

README.md

@@ -66,6 +66,9 @@ do_archive_push(char *wal_file_path, char *wal_file_name)
 	join_path_components(backup_wal_file_path, arclog_path, wal_file_name);
 
 	elog(INFO, "pg_probackup archive-push from %s to %s", absolute_wal_file_path, backup_wal_file_path);
+	if (access(backup_wal_file_path, F_OK) != -1)
+		elog(ERROR, "file '%s', already exists.", backup_wal_file_path);
+
 	copy_wal_file(absolute_wal_file_path, backup_wal_file_path);
 	elog(INFO, "pg_probackup archive-push completed successfully");
 

src/archive.c

@@ -1112,6 +1112,7 @@ pg_stop_backup(pgBackup *backup)
 				 backup_label, strerror(errno));
 
 		fwrite(PQgetvalue(res, 0, 1), 1, strlen(PQgetvalue(res, 0, 1)), fp);
+		fsync(fileno(fp));
 		fclose(fp);
 
 		/*
@@ -1139,6 +1140,7 @@ pg_stop_backup(pgBackup *backup)
 					 tablespace_map, strerror(errno));
 
 			fwrite(PQgetvalue(res, 0, 2), 1, strlen(PQgetvalue(res, 0, 2)), fp);
+			fsync(fileno(fp));
 			fclose(fp);
 
 			file = pgFileNew(tablespace_map, true);
@@ -1662,6 +1664,7 @@ write_backup_file_list(parray *files, const char *root)
 
 	print_file_list(fp, files, root);
 
+	fsync(fileno(fp));
 	fclose(fp);
 }
 

src/backup.c

@@ -357,6 +357,7 @@ backup_data_file(const char *from_root, const char *to_root,
 			 strerror(errno_tmp));
 	}
 
+	fsync(fileno(out));
 	fclose(in);
 	fclose(out);
 
@@ -470,6 +471,7 @@ restore_file_partly(const char *from_root,const char *to_root, pgFile *file)
 			strerror(errno_tmp));
 	}
 
+	fsync(fileno(out));
 	fclose(in);
 	fclose(out);
 }
@@ -605,6 +607,7 @@ restore_data_file(const char *from_root,
 			 strerror(errno_tmp));
 	}
 
+	fsync(fileno(out));
 	fclose(in);
 	fclose(out);
 }
@@ -732,6 +735,7 @@ copy_file(const char *from_root, const char *to_root, pgFile *file)
 			 strerror(errno_tmp));
 	}
 
+	fsync(fileno(out));
 	fclose(in);
 	fclose(out);
 
@@ -832,9 +836,9 @@ copy_wal_file(const char *from_path, const char *to_path)
 			 strerror(errno_tmp));
 	}
 
+	fsync(fileno(out));
 	fclose(in);
 	fclose(out);
-
 }
 
 /*
@@ -957,6 +961,7 @@ copy_file_partly(const char *from_root, const char *to_root,
 	/* add meta information needed for recovery */
 	file->is_partial_copy = true;
 
+	fsync(fileno(out));
 	fclose(in);
 	fclose(out);
 

src/data.c

@@ -319,7 +319,7 @@ validate_wal(pgBackup *backup,
 	 * If recovery target is provided check that we can restore backup to a
 	 * recoverty target time or xid.
 	 */
-	if (!TransactionIdIsValid(target_xid) || target_time == 0)
+	if (!TransactionIdIsValid(target_xid) && target_time == 0)
 	{
 		/* Recoverty target is not given so exit */
 		elog(INFO, "backup validation completed successfully");

src/parsexlog.c

@@ -17,7 +17,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-const char *PROGRAM_VERSION	= "1.1.17";
+const char *PROGRAM_VERSION	= "2.0.0";
 const char *PROGRAM_URL		= "https://github.com/postgrespro/pg_probackup";
 const char *PROGRAM_EMAIL	= "https://github.com/postgrespro/pg_probackup/issues";
 
@@ -72,6 +72,7 @@ uint32		retention_window = 0;
 /* compression options */
 CompressAlg compress_alg = NOT_DEFINED_COMPRESS;
 int			compress_level = DEFAULT_COMPRESS_LEVEL;
+bool 		compress_shortcut = false;
 
 /* other options */
 char	   *instance_name;
@@ -132,6 +133,7 @@ static pgut_option options[] =
 	/* compression options */
 	{ 'f', 36, "compress-algorithm",	opt_compress_alg,	SOURCE_CMDLINE },
 	{ 'u', 37, "compress-level",		&compress_level,	SOURCE_CMDLINE },
+	{ 'b', 38, "compress",				&compress_shortcut,	SOURCE_CMDLINE },
 	/* logging options */
 	{ 'f', 40, "log-level",				opt_log_level,		SOURCE_CMDLINE },
 	{ 's', 41, "log-filename",			&log_filename,		SOURCE_CMDLINE },
@@ -353,6 +355,9 @@ main(int argc, char *argv[])
 	if (num_threads < 1)
 		num_threads = 1;
 
+	if (compress_shortcut)
+		compress_alg = ZLIB_COMPRESS;
+
 	if (backup_subcmd != SET_CONFIG)
 	{
 		if (compress_level != DEFAULT_COMPRESS_LEVEL
@@ -405,7 +410,7 @@ main(int argc, char *argv[])
 				elog(ERROR, "show-config command doesn't accept any options except -B and --instance");
 			return do_configure(true);
 		case SET_CONFIG:
-			if (argc == 5)
+			if (argc == 6)
 				elog(ERROR, "set-config command requires at least one option");
 			return do_configure(false);
 	}

src/pg_probackup.c

@@ -294,6 +294,7 @@ extern uint32 retention_window;
 /* compression options */
 extern CompressAlg compress_alg;
 extern int    compress_level;
+extern bool		compress_shortcut;
 
 #define DEFAULT_COMPRESS_LEVEL 6
 

src/pg_probackup.h

@@ -750,6 +750,7 @@ create_recovery_conf(time_t backup_id,
 	if (target_tli)
 		fprintf(fp, "recovery_target_timeline = '%u'\n", target_tli);
 
+	fsync(fileno(fp));
 	fclose(fp);
 }
 

src/restore.c

@@ -230,7 +230,10 @@ do_validate_all(void)
 	}
 
 	if (corrupted_backup_found)
+	{
 		elog(INFO, "Some backups are not valid");
+		return 1;
+	}
 	else
 		elog(INFO, "All backups are valid");
 

src/validate.c

@@ -6,16 +6,11 @@
     ptrack_move_to_tablespace, ptrack_recovery, ptrack_vacuum, \
     ptrack_vacuum_bits_frozen, ptrack_vacuum_bits_visibility, \
     ptrack_vacuum_full, ptrack_vacuum_truncate, pgpro560, pgpro589, \
-    pgpro688, false_positive, replica
+    false_positive, replica
 
 
 def load_tests(loader, tests, pattern):
     suite = unittest.TestSuite()
-    suite.addTests(loader.loadTestsFromModule(replica))
-#    suite.addTests(loader.loadTestsFromModule(pgpro560))
-#    suite.addTests(loader.loadTestsFromModule(pgpro589))
-#    suite.addTests(loader.loadTestsFromModule(pgpro688))
-#    suite.addTests(loader.loadTestsFromModule(false_positive))
     suite.addTests(loader.loadTestsFromModule(init_test))
     suite.addTests(loader.loadTestsFromModule(option_test))
     suite.addTests(loader.loadTestsFromModule(show_test))
@@ -33,8 +28,9 @@ def load_tests(loader, tests, pattern):
     suite.addTests(loader.loadTestsFromModule(ptrack_vacuum_bits_visibility))
     suite.addTests(loader.loadTestsFromModule(ptrack_vacuum_full))
     suite.addTests(loader.loadTestsFromModule(ptrack_vacuum_truncate))
+    suite.addTests(loader.loadTestsFromModule(replica))
+    suite.addTests(loader.loadTestsFromModule(pgpro560))
+    suite.addTests(loader.loadTestsFromModule(pgpro589))
+    suite.addTests(loader.loadTestsFromModule(false_positive))
 
     return suite
-
-
-# ExpectedFailures are bugs, which should be fixed