fsync directory after rename

knizhnik · knizhnik · commit fd6b5101fa4a · 2017-06-21T13:24:05.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -706,7 +706,7 @@ static bool cfs_gc_file(char* map_path, bool background)
 	cfs_state->gc_stat.scannedFiles += 1;
 
 	/* do we need to perform defragmentation? */
-	if ((physSize - usedSize)*100 > physSize*cfs_gc_threshold)
+	if ((uint64)(physSize - usedSize)*100 > (uint64)physSize*cfs_gc_threshold)
 	{
 		long delay = CFS_LOCK_MIN_TIMEOUT;
 		char* file_path = (char*)palloc(suf+1);
@@ -950,6 +950,11 @@ static bool cfs_gc_file(char* map_path, bool background)
 			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:
 		/*
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -330,7 +330,6 @@ 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);
 
 
 /*
@@ -3520,7 +3519,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.
  */
-static int
+int
 fsync_parent_path(const char *fname, int elevel)
 {
 	char		parentpath[MAXPGPATH];
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -6,7 +6,7 @@
 #include "port/atomics.h"
 #include "storage/rijndael.h"
 
-#define CFS_VERSION "0.36"
+#define CFS_VERSION "0.41"
 
 #define CFS_GC_LOCK  0x10000000
 
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
@@ -120,6 +120,7 @@ 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);
