Remove the correct pgstat file on DROP DATABASE

alvherre · alvherre · commit 2b4f2ab33dea · 2014-03-05T13:03:29.000-03:00
We were unlinking the permanent file, not the non-permanent one. But since the stat collector already unlinks all permanent files on startup, there was nothing for it to unlink. The non-permanent file remained in place, and was copied to the permanent directory on shutdown, so in effect no file was ever dropped. Backpatch to 9.3, where the issue was introduced by commit 187492b. Before that, there were no per-database files and thus no file to drop on DROP DATABASE. Per report from Thom Brown. Author: Tomáš Vondra
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
@@ -4772,7 +4772,7 @@ pgstat_recv_dropdb(PgStat_MsgDropdb *msg, int len)
 	{
 		char		statfile[MAXPGPATH];
 
-		get_dbstat_filename(true, false, dbid, statfile, MAXPGPATH);
+		get_dbstat_filename(false, false, dbid, statfile, MAXPGPATH);
 
 		elog(DEBUG2, "removing %s", statfile);
 		unlink(statfile);

Original file line number	Diff line number	Diff line change
`@@ -4772,7 +4772,7 @@ pgstat_recv_dropdb(PgStat_MsgDropdb *msg, int len)`
`4772`	`4772`	`{`
`4773`	`4773`	`char statfile[MAXPGPATH];`
`4774`	`4774`
`4775`		`- get_dbstat_filename(true, false, dbid, statfile, MAXPGPATH);`
	`4775`	`+ get_dbstat_filename(false, false, dbid, statfile, MAXPGPATH);`
`4776`	`4776`
`4777`	`4777`	`elog(DEBUG2, "removing %s", statfile);`
`4778`	`4778`	`unlink(statfile);`