Clear ptrack_control if ptrack_enable is false.

stalkerg · stalkerg · commit 8b16a736c000 · 2016-05-10T18:39:57.000+03:00
diff --git a/src/backend/access/heap/ptrack.c b/src/backend/access/heap/ptrack.c
@@ -271,21 +271,19 @@ SetPtrackClearLSN(bool set_invalid)
 {
 	int			fd;
 	XLogRecPtr	ptr;
-	char		path[MAXPGPATH];
 	if (set_invalid)
 		ptr = InvalidXLogRecPtr;
 	else
 		ptr = GetXLogInsertRecPtr();
-	snprintf(path, sizeof(path), "%s/global/ptrack_control", DataDir);
 	//LWLockAcquire(ControlFileLock, LW_EXCLUSIVE);
-	fd = BasicOpenFile(path,
-					   O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
+	fd = BasicOpenFile("global/ptrack_control",
+					   O_RDWR | O_CREAT | PG_BINARY,
 					   S_IRUSR | S_IWUSR);
 	if (fd < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
 				 errmsg("could not create ptrack control file \"%s\": %m",
-						path)));
+						"global/ptrack_control")));
 
 	errno = 0;
 	if (write(fd, &ptr, sizeof(XLogRecPtr)) != sizeof(XLogRecPtr))
@@ -470,7 +468,6 @@ pg_ptrack_test(PG_FUNCTION_ARGS)
 void
 assign_ptrack_enable(bool newval, void *extra)
 {
-	/*elog(WARNING, "assign_ptrack_enable:%s %i", newval ? "true" : "false", IsInitProcessingMode());
-	if(IsInitProcessingMode() && !newval)
-		SetPtrackClearLSN(true);*/
+	if(DataDir != NULL && !IsBootstrapProcessingMode() && !newval)
+		SetPtrackClearLSN(true);
 }
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
@@ -24,6 +24,7 @@
 #include "access/sysattr.h"
 #include "access/xact.h"
 #include "access/xlog.h"
+#include "access/ptrack.h"
 #include "catalog/catalog.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
@@ -552,6 +553,8 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
 
 	elog(DEBUG3, "InitPostgres");
 
+	assign_ptrack_enable(ptrack_enable, NULL);
+
 	/*
 	 * Add my PGPROC struct to the ProcArray.
 	 *
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -988,7 +988,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 
 	{
-		{"ptrack_enable", PGC_POSTMASTER, WAL_SETTINGS,
+		{"ptrack_enable", PGC_SU_BACKEND, WAL_SETTINGS,
 			gettext_noop("Enable page tracking."),
 			NULL
 		},

Original file line number	Diff line number	Diff line change
`@@ -988,7 +988,7 @@ static struct config_bool ConfigureNamesBool[] =`
`988`	`988`	`},`
`989`	`989`
`990`	`990`	`{`
`991`		`- {"ptrack_enable", PGC_POSTMASTER, WAL_SETTINGS,`
	`991`	`+ {"ptrack_enable", PGC_SU_BACKEND, WAL_SETTINGS,`
`992`	`992`	`gettext_noop("Enable page tracking."),`
`993`	`993`	`NULL`
`994`	`994`	`},`