Use durable_rename

Author: knizhnik

src/backend/storage/file/cfs.c

@@ -961,16 +961,11 @@ static bool cfs_gc_file(char* map_path, bool background)
 		 * Use rename and rely on file system to provide atomicity of this operation.
 		 */
 		remove_backups = false;
-		if (rename(file_bck_path, file_path) < 0)
+		if (durable_rename(file_bck_path, file_path, LOG) < 0)
 		{
 			elog(WARNING, "CFS failed to rename file %s: %m", file_path);
 			goto Cleanup;
 		}
-		if (fsync_parent_path(file_path, LOG) != 0)
-		{
-			elog(WARNING, "CFS failed to sync directory for file %s: %m", file_path);
-			goto Cleanup;
-		}
 
 	  ReplaceMap:
 		/*
@@ -1174,7 +1169,7 @@ static void cfs_gc_bgworker_main(Datum arg)
 void cfs_gc_start_bgworkers()
 {
 	int i;
-	cfs_state->max_iterations = INT_MAX;
+	cfs_state->max_iterations = INT64_MAX;
 	cfs_state->n_workers = cfs_gc_workers;
 
 	for (i = 0; i < cfs_gc_workers; i++)

src/backend/storage/file/fd.c

@@ -330,6 +330,7 @@ static void pre_sync_fname(const char *fname, bool isdir, int elevel);
 static void datadir_fsync_fname(const char *fname, bool isdir, int elevel);
 
 static int	fsync_fname_ext(const char *fname, bool isdir, bool ignore_perm, int elevel);
+static int  fsync_parent_path(const char *fname, int elevel);
 
 
 /*
@@ -1774,7 +1775,7 @@ FileRead(File file, char *buffer, int amount)
 		amount = CFS_INODE_SIZE(inode);
 		if (amount == 0)
 		{
-			uint32 fileSize = pg_atomic_read_u32(&map->virtSize);
+			uint32 fileSize = pg_atomic_read_u32(&map->hdr.virtSize);
 			if (VfdCache[file].seekPos + BLCKSZ <= fileSize)
 			{
 				amount = BLCKSZ;
@@ -2178,7 +2179,7 @@ FileSeek(File file, off_t offset, int whence)
 				if (VfdCache[file].fileFlags & PG_COMPRESSION)
 				{
 					FileMap* map = VfdCache[file].map;
-					uint32 fileSize = pg_atomic_read_u32(&map->virtSize);
+					uint32 fileSize = pg_atomic_read_u32(&map->hdr.virtSize);
 
 					if (offset > 0 && offset > fileSize)
 						offset = fileSize;
@@ -2267,13 +2268,13 @@ FileTruncate(File file, off_t offset)
 			map->inodes[i] = 0;
 		}
 
-		pg_atomic_write_u32(&map->virtSize, offset);
-		pg_atomic_fetch_sub_u32(&map->usedSize, released);
+		pg_atomic_write_u32(&map->hdr.virtSize, offset);
+		pg_atomic_fetch_sub_u32(&map->hdr.usedSize, released);
 
 		if (offset == 0)
 		{
 			/* We can truncate compressed file only with zero offset */
-			pg_atomic_write_u32(&map->physSize, 0);
+			pg_atomic_write_u32(&map->hdr.physSize, 0);
 			returnCode = ftruncate(VfdCache[file].fd, 0);
 		}
 		cfs_unlock_file(map);
@@ -3519,7 +3520,7 @@ fsync_fname_ext(const char *fname, bool isdir, bool ignore_perm, int elevel)
  * This is aimed at making file operations persistent on disk in case of
  * an OS crash or power failure.
  */
-int
+static int
 fsync_parent_path(const char *fname, int elevel)
 {
 	char		parentpath[MAXPGPATH];

src/include/storage/cfs.h

@@ -6,7 +6,7 @@
 #include "port/atomics.h"
 #include "storage/rijndael.h"
 
-#define CFS_VERSION "0.41"
+#define CFS_VERSION "0.42"
 
 #define CFS_GC_LOCK  0x10000000
 
@@ -81,7 +81,7 @@ typedef struct
 	int            n_workers;
 	/* Maximal number of iterations with GC should perform. Automatically started GC performs infinite number of iterations.
 	 * Manually started GC performs just one iteration. */
-	int            max_iterations;
+	int64          max_iterations;
 	/* Flag for temporary disabling GC */
 	bool           gc_enabled;
 	/* Flag for controlling background GC */

src/include/storage/fd.h

@@ -120,7 +120,6 @@ extern int	pg_fsync_writethrough(int fd);
 extern int	pg_fdatasync(int fd);
 extern void pg_flush_data(int fd, off_t offset, off_t amount);
 extern void fsync_fname(const char *fname, bool isdir);
-extern int  fsync_parent_path(const char *fname, int elevel);
 extern int	durable_rename(const char *oldfile, const char *newfile, int loglevel);
 extern int	durable_link_or_rename(const char *oldfile, const char *newfile, int loglevel);
 extern void SyncDataDirectory(void);