Set generation in PathNameOpenFile function

knizhnik · knizhnik · commit e32962ce979e · 2017-06-20T14:23:51.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -1124,7 +1124,7 @@ static void cfs_gc_bgworker_main(Datum arg)
 	/* We're now ready to receive signals */
 	BackgroundWorkerUnblockSignals();
 
-	elog(INFO, "Start CFS garbage collector %d", MyProcPid);
+	elog(INFO, "Start CFS garbage collector %d (enabled=%d)", MyProcPid, cfs_state->background_gc_enabled);
 
 	while (true)
 	{
@@ -1253,7 +1253,9 @@ Datum cfs_start_gc(PG_FUNCTION_ARGS)
 
 Datum cfs_enable_gc(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_BOOL(cfs_control_gc(PG_GETARG_BOOL(0)));
+	bool was_enabled = cfs_state->background_gc_enabled;
+	cfs_state->background_gc_enabled = PG_GETARG_BOOL(0);
+	PG_RETURN_BOOL(was_enabled);
 }
 
 Datum cfs_version(PG_FUNCTION_ARGS)
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1339,46 +1339,56 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 	/* Close excess kernel FDs. */
 	ReleaseLruFiles();
 
-	vfdP->fd = BasicOpenFile(fileName, fileFlags, fileMode);
-
-	if (vfdP->fd < 0)
-	{
-		save_errno = errno;
-	io_error:
-		FreeVfd(file);
-		free(fnamecopy);
-		errno = save_errno;
-		return -1;
-	}
-
 	if (fileFlags & PG_COMPRESSION)
 	{
-		char* mapFileName = psprintf("%s.cfm", fileName);
-		vfdP->md = open(mapFileName, O_CREAT | O_RDWR | (fileFlags & ~(PG_COMPRESSION|O_EXCL)), fileMode);
+		char* mapFileName = psprintf("%s.cfm", vfdP->fileName);
+		vfdP->md = BasicOpenFile(mapFileName, vfdP->fileFlags & ~PG_COMPRESSION, vfdP->fileMode);
 		pfree(mapFileName);
 		if (vfdP->md < 0)
 		{
 			save_errno = errno;
-			close(vfdP->fd);
-			vfdP->fd = VFD_CLOSED;
-			elog(LOG, "OPEN MAP FAILED: %d", errno);
+			elog(LOG, "RE_OPEN MAP FAILED: %d", errno);
 			goto io_error;
 		}
-
 		vfdP->map = cfs_mmap(vfdP->md);
 		if (vfdP->map == MAP_FAILED)
 		{
 			save_errno = errno;
-			close(vfdP->fd);
+			elog(LOG, "RE_MAP FAILED: %d", errno);
+			close(vfdP->md);
+			goto io_error;
+		}
+		/* We need to copy generation before openning data file */
+		vfdP->generation = vfdP->map->generation;
+		pg_read_barrier();
+
+		vfdP->fd = BasicOpenFile(vfdP->fileName, vfdP->fileFlags,
+								 vfdP->fileMode);
+		if (vfdP->fd < 0)
+		{
+			save_errno = errno;
+			DO_DB(elog(LOG, "re-open failed: %m"));
+			cfs_munmap(vfdP->map);
 			close(vfdP->md);
-			vfdP->fd = VFD_CLOSED;
 			vfdP->md = VFD_CLOSED;
-			elog(LOG, "MAP FAILED: %d", errno);
 			goto io_error;
 		}
-		++nfile;
+		nfile += 2;
+	}
+	else
+	{
+		vfdP->fd = BasicOpenFile(fileName, fileFlags, fileMode);
+		if (vfdP->fd < 0)
+		{
+			save_errno = errno;
+		  io_error:
+			FreeVfd(file);
+			free(fnamecopy);
+			errno = save_errno;
+			return -1;
+		}
+		nfile += 1;
 	}
-	++nfile;
 	DO_DB(elog(LOG, "PathNameOpenFile: success %d",
 			   vfdP->fd));
 

Original file line number	Diff line number	Diff line change
`@@ -1124,7 +1124,7 @@ static void cfs_gc_bgworker_main(Datum arg)`
`1124`	`1124`	`/* We're now ready to receive signals */`
`1125`	`1125`	`BackgroundWorkerUnblockSignals();`
`1126`	`1126`
`1127`		`- elog(INFO, "Start CFS garbage collector %d", MyProcPid);`
	`1127`	`+ elog(INFO, "Start CFS garbage collector %d (enabled=%d)", MyProcPid, cfs_state->background_gc_enabled);`
`1128`	`1128`
`1129`	`1129`	`while (true)`
`1130`	`1130`	`{`
`@@ -1253,7 +1253,9 @@ Datum cfs_start_gc(PG_FUNCTION_ARGS)`
`1253`	`1253`
`1254`	`1254`	`Datum cfs_enable_gc(PG_FUNCTION_ARGS)`
`1255`	`1255`	`{`
`1256`		`- PG_RETURN_BOOL(cfs_control_gc(PG_GETARG_BOOL(0)));`
	`1256`	`+ bool was_enabled = cfs_state->background_gc_enabled;`
	`1257`	`+ cfs_state->background_gc_enabled = PG_GETARG_BOOL(0);`
	`1258`	`+ PG_RETURN_BOOL(was_enabled);`
`1257`	`1259`	`}`
`1258`	`1260`
`1259`	`1261`	`Datum cfs_version(PG_FUNCTION_ARGS)`