[Issue #364] honor the "--no-validate" flag when working with tablespace_map

Author: gsmolk

src/dir.c

@@ -1116,6 +1116,8 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
 		elog(VERBOSE, "Create directory \"%s\"", dir->rel_path);
 
 		join_path_components(to_path, data_dir, dir->rel_path);
+
+		// TODO check exit code
 		fio_mkdir(to_path, dir->mode, location);
 	}
 
@@ -1191,7 +1193,7 @@ read_tablespace_map(parray *links, const char *backup_dir)
  *  3. backup has tablespaces and some of them are not empty
  */
 int
-check_tablespace_mapping(pgBackup *backup, bool incremental, bool force, bool pgdata_is_empty)
+check_tablespace_mapping(pgBackup *backup, bool incremental, bool force, bool pgdata_is_empty, bool no_validate)
 {
 	parray	   *links = parray_new();
 	size_t		i;
@@ -1205,7 +1207,7 @@ check_tablespace_mapping(pgBackup *backup, bool incremental, bool force, bool pg
 	/* validate tablespace map,
 	 * if there are no tablespaces, then there is nothing left to do
 	 */
-	if (!validate_tablespace_map(backup))
+	if (!validate_tablespace_map(backup, no_validate))
 	{
 		/*
 		 * Sanity check

src/pg_probackup.h

@@ -891,7 +891,7 @@ extern int do_validate_all(void);
 extern int validate_one_page(Page page, BlockNumber absolute_blkno,
 							 XLogRecPtr stop_lsn, PageState *page_st,
 							 uint32 checksum_version);
-extern bool validate_tablespace_map(pgBackup *backup);
+extern bool validate_tablespace_map(pgBackup *backup, bool no_validate);
 
 extern parray* get_history_streaming(ConnectionOptions *conn_opt, TimeLineID tli, parray *backup_list);
 
@@ -987,7 +987,7 @@ extern void create_data_directories(parray *dest_files,
 extern void read_tablespace_map(parray *links, const char *backup_dir);
 extern void opt_tablespace_map(ConfigOption *opt, const char *arg);
 extern void opt_externaldir_map(ConfigOption *opt, const char *arg);
-extern int  check_tablespace_mapping(pgBackup *backup, bool incremental, bool force, bool pgdata_is_empty);
+extern int  check_tablespace_mapping(pgBackup *backup, bool incremental, bool force, bool pgdata_is_empty, bool no_validate);
 extern void check_external_dir_mapping(pgBackup *backup, bool incremental);
 extern char *get_external_remap(char *current_dir);
 

src/restore.c

@@ -410,7 +410,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 	{
 		int rc = check_tablespace_mapping(dest_backup,
 										  params->incremental_mode != INCR_NONE, params->force,
-										  pgdata_is_empty);
+										  pgdata_is_empty, params->no_validate);
 
 		/* backup contain no tablespaces */
 		if (rc == NoTblspc)
@@ -2173,6 +2173,8 @@ check_incremental_compatibility(const char *pgdata, uint64 system_identifier,
 		postmaster_is_up = true;
 	}
 
+	/* check that PG_VERSION is the same */
+
 	/* slurp pg_control and check that system ID is the same
 	 * check that instance is not running
 	 * if lsn_based, check that there is no backup_label files is around AND
@@ -2182,6 +2184,7 @@ check_incremental_compatibility(const char *pgdata, uint64 system_identifier,
 	 * data files content, because based on pg_control information we will
 	 * choose a backup suitable for lsn based incremental restore.
 	 */
+	elog(INFO, "Trying to read pg_control file in destination direstory");
 
 	system_id_pgdata = get_system_identifier(pgdata);
 
@@ -2214,6 +2217,10 @@ check_incremental_compatibility(const char *pgdata, uint64 system_identifier,
 	if (postmaster_is_up)
 		return POSTMASTER_IS_RUNNING;
 
+	/* PG_CONTROL MISSING */
+
+	/* PG_CONTROL unreadable */
+
 	if (!system_id_match)
 		return SYSTEM_ID_MISMATCH;
 

src/validate.c

@@ -709,7 +709,7 @@ do_validate_instance(void)
  * already filled pgBackup.files
  */
 bool
-validate_tablespace_map(pgBackup *backup)
+validate_tablespace_map(pgBackup *backup, bool no_validate)
 {
 	char        map_path[MAXPGPATH];
 	pgFile     *dummy = NULL;
@@ -740,12 +740,15 @@ validate_tablespace_map(pgBackup *backup)
 			map_path, base36enc(backup->backup_id));
 
 	/* check tablespace map checksumms */
-	crc = pgFileGetCRC(map_path, use_crc32c, false);
+	if (!no_validate)
+	{
+		crc = pgFileGetCRC(map_path, use_crc32c, false);
 
-	if ((*tablespace_map)->crc != crc)
-		elog(ERROR, "Invalid CRC of tablespace map file \"%s\" : %X. Expected %X, "
-					"probably backup %s is corrupt, validate it",
-				map_path, crc, (*tablespace_map)->crc, base36enc(backup->backup_id));
+		if ((*tablespace_map)->crc != crc)
+			elog(ERROR, "Invalid CRC of tablespace map file \"%s\" : %X. Expected %X, "
+						"probably backup %s is corrupt, validate it",
+					map_path, crc, (*tablespace_map)->crc, base36enc(backup->backup_id));
+	}
 
 	pgFileFree(dummy);
 	parray_walk(files, pgFileFree);