Fix race condition in CFS

knizhnik · knizhnik · commit 4a8146bf0e9a · 2017-06-16T18:58:08.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -871,7 +871,7 @@ static bool cfs_gc_file(char* map_path, bool background)
 		fd2 = -1;
 
 		/* Persist copy of map file */
-		if (!cfs_write_file(md2, &newMap, sizeof(newMap)))
+		if (!cfs_write_file(md2, &newMap, sizeof(FileMap)))
 		{
 			elog(WARNING, "CFS failed to write file %s: %m", map_bck_path);
 			goto Cleanup;
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1068,44 +1068,47 @@ LruInsert(File file)
 		 * overall system file table being full.  So, be prepared to release
 		 * another FD if necessary...
 		 */
-		vfdP->fd = BasicOpenFile(vfdP->fileName, vfdP->fileFlags,
-								 vfdP->fileMode);
-		if (vfdP->fd < 0)
-		{
-			DO_DB(elog(LOG, "RE-OPEN FAILED: %m"));
-			return -1;
-		}
-		else
-			DO_DB(elog(LOG, "RE_OPEN SUCCESS"));
-
-		if (vfdP->fileFlags & PG_COMPRESSION)
+		if (vfdP->fileFlags & PG_COMPRESSION) 
 		{
 			char* mapFileName = psprintf("%s.cfm", vfdP->fileName);
 			vfdP->md = open(mapFileName, vfdP->fileFlags & ~PG_COMPRESSION, vfdP->fileMode);
 			pfree(mapFileName);
-
 			if (vfdP->md < 0)
 			{
 				elog(LOG, "RE_OPEN MAP FAILED: %d", errno);
-				close(vfdP->fd);
-				vfdP->fd = VFD_CLOSED;
 				return -1;
 			}
-
 			vfdP->map = cfs_mmap(vfdP->md);
 			if (vfdP->map == MAP_FAILED)
 			{
 				elog(LOG, "RE_MAP FAILED: %d", errno);
-				close(vfdP->fd);
 				close(vfdP->md);
-				vfdP->fd = VFD_CLOSED;
+				return -1;
+			}
+			/* We need to copy generation before openning data file */
+			vfdP->generation = vfdP->map->generation;
+
+			vfdP->fd = BasicOpenFile(vfdP->fileName, vfdP->fileFlags,
+									 vfdP->fileMode);
+			if (vfdP->fd < 0)
+			{
+				DO_DB(elog(LOG, "re-open failed: %m"));
+				cfs_munmap(vfdP->map);
+				close(vfdP->md);
 				vfdP->md = VFD_CLOSED;
 				return -1;
 			}
 			nfile += 2;
 		}
 		else
 		{
+			vfdP->fd = BasicOpenFile(vfdP->fileName, vfdP->fileFlags,
+								 vfdP->fileMode);
+			if (vfdP->fd < 0)
+			{
+				DO_DB(elog(LOG, "RE-OPEN FAILED: %m"));
+				return -1;
+			}
 
 			/*
 			* Seek to the right position.  We need no special case for seekPos
@@ -1553,6 +1556,7 @@ FileClose(File file)
 
 			if (close(vfdP->md))
 				elog(ERROR, "could not close map file \"%s.cfm\": %m", vfdP->fileName);
+			vfdP->md = VFD_CLOSED;
 			--nfile;
 		}
 		--nfile;
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.29"
+#define CFS_VERSION "0.32"
 
 #define CFS_GC_LOCK  0x10000000
 

Original file line number	Diff line number	Diff line change
`@@ -871,7 +871,7 @@ static bool cfs_gc_file(char* map_path, bool background)`
`871`	`871`	`fd2 = -1;`
`872`	`872`
`873`	`873`	`/* Persist copy of map file */`
`874`		`- if (!cfs_write_file(md2, &newMap, sizeof(newMap)))`
	`874`	`+ if (!cfs_write_file(md2, &newMap, sizeof(FileMap)))`
`875`	`875`	`{`
`876`	`876`	`elog(WARNING, "CFS failed to write file %s: %m", map_bck_path);`
`877`	`877`	`goto Cleanup;`