[PBCKP-146] - fio_get_crc32 - add "missing_ok" parameter

Author: funny-falcon

src/data.c

@@ -801,8 +801,11 @@ backup_non_data_file(pgFile *file, pgFile *prev_file,
 		(prev_file && file->exists_in_prev &&
 		 file->mtime <= parent_backup_time))
 	{
-
-		file->crc = fio_get_crc32(FIO_DB_HOST, from_fullpath, false);
+		/*
+		 * file could be deleted under our feets.
+		 * But then backup_non_data_file_internal will handle it safely
+		 */
+		file->crc = fio_get_crc32(FIO_DB_HOST, from_fullpath, false, true);
 
 		/* ...and checksum is the same... */
 		if (EQ_TRADITIONAL_CRC32(file->crc, prev_file->crc))
@@ -1327,7 +1330,8 @@ restore_non_data_file(parray *parent_chain, pgBackup *dest_backup,
 	if (already_exists)
 	{
 		/* compare checksums of already existing file and backup file */
-		pg_crc32 file_crc = fio_get_crc32(FIO_DB_HOST, to_fullpath, false);
+		pg_crc32 file_crc = fio_get_crc32(FIO_DB_HOST, to_fullpath, false,
+										  false);
 
 		if (file_crc == tmp_file->crc)
 		{

src/utils/file.c

@@ -1402,9 +1402,15 @@ fio_sync(fio_location location, const char* path)
 	}
 }
 
+enum {
+	GET_CRC32_DECOMPRESS = 1,
+	GET_CRC32_MISSING_OK = 2
+};
+
 /* Get crc32 of file */
 pg_crc32
-fio_get_crc32(fio_location location, const char *file_path, bool decompress)
+fio_get_crc32(fio_location location, const char *file_path,
+			  bool decompress, bool missing_ok)
 {
 	if (fio_is_remote(location))
 	{
@@ -1417,7 +1423,9 @@ fio_get_crc32(fio_location location, const char *file_path, bool decompress)
 		hdr.arg = 0;
 
 		if (decompress)
-			hdr.arg = 1;
+			hdr.arg = GET_CRC32_DECOMPRESS;
+		if (missing_ok)
+			hdr.arg |= GET_CRC32_MISSING_OK;
 
 		IO_CHECK(fio_write_all(fio_stdout, &hdr, sizeof(hdr)), sizeof(hdr));
 		IO_CHECK(fio_write_all(fio_stdout, file_path, path_len), path_len);
@@ -1428,9 +1436,9 @@ fio_get_crc32(fio_location location, const char *file_path, bool decompress)
 	else
 	{
 		if (decompress)
-			return pgFileGetCRCgz(file_path, true, true);
+			return pgFileGetCRCgz(file_path, true, missing_ok);
 		else
-			return pgFileGetCRC(file_path, true, true);
+			return pgFileGetCRC(file_path, true, missing_ok);
 	}
 }
 
@@ -3365,10 +3373,10 @@ fio_communicate(int in, int out)
             break;
 		  case FIO_GET_CRC32:
 			/* calculate crc32 for a file */
-			if (hdr.arg == 1)
-				crc = pgFileGetCRCgz(buf, true, true);
+			if ((hdr.arg & GET_CRC32_DECOMPRESS))
+				crc = pgFileGetCRCgz(buf, true, (hdr.arg & GET_CRC32_MISSING_OK) != 0);
 			else
-				crc = pgFileGetCRC(buf, true, true);
+				crc = pgFileGetCRC(buf, true, (hdr.arg & GET_CRC32_MISSING_OK) != 0);
 			IO_CHECK(fio_write_all(out, &crc, sizeof(crc)), sizeof(crc));
 			break;
 		  case FIO_GET_CHECKSUM_MAP:
@@ -3606,9 +3614,9 @@ pioLocalDrive_pioGetCRC32(VSelf, path_t path, bool compressed, err_i *err)
     elog(VERBOSE, "Local Drive calculate crc32 for '%s', compressed=%d",
          path, compressed);
     if (compressed)
-        return pgFileGetCRCgz(path, true, true);
+        return pgFileGetCRCgz(path, true, false);
     else
-        return pgFileGetCRC(path, true, true);
+        return pgFileGetCRC(path, true, false);
 }
 
 static bool
@@ -3867,7 +3875,7 @@ pioRemoteDrive_pioGetCRC32(VSelf, path_t path, bool compressed, err_i *err)
     hdr.arg = 0;
 
     if (compressed)
-        hdr.arg = 1;
+        hdr.arg = GET_CRC32_DECOMPRESS;
     elog(VERBOSE, "Remote Drive calculate crc32 for '%s', hdr.arg=%d",
          path, compressed);
 

src/utils/file.h

@@ -161,7 +161,9 @@ extern int     fio_closedir(DIR *dirp);
 
 /* pathname-style functions */
 extern int     fio_sync(fio_location location, const char* path);
-extern pg_crc32 fio_get_crc32(fio_location location, const char *file_path, bool decompress);
+extern pg_crc32
+fio_get_crc32(fio_location location, const char *file_path,
+			  bool decompress, bool missing_ok);
 
 extern int     fio_rename(fio_location location, const char* old_path, const char* new_path);
 extern int     fio_symlink(fio_location location, const char* target, const char* link_path, bool overwrite);