On Windows, force a checkpoint just before dropping a database's physical

files and directories.  This ensures that the bgwriter will close any open
file references it is holding for files therein, which is needed for the
rmdir() to succeed.  Andrew Dunstan and Tom Lane.

2 files changed, 20 insertions, 11 deletions

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 917429c2b52..a74ad9b2f07 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.145 2004/10/17 20:47:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.146 2004/10/28 00:39:58 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,6 +32,7 @@
 #include "commands/tablespace.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
+#include "postmaster/bgwriter.h"
 #include "storage/fd.h"
 #include "storage/freespace.h"
 #include "storage/sinval.h"
@@ -625,6 +626,14 @@ dropdb(const char *dbname)
 	FreeSpaceMapForgetDatabase(db_id);
 
 	/*
+	 * On Windows, force a checkpoint so that the bgwriter doesn't hold any
+	 * open files, which would cause rmdir() to fail.
+	 */
+#ifdef WIN32
+	RequestCheckpoint(true);
+#endif
+
+	/*
 	 * Remove all tablespace subdirs belonging to the database.
 	 */
 	remove_dbtablespaces(db_id);
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index f0b32b12654..25b953da2fa 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.9 2004/10/12 21:54:40 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.10 2004/10/28 00:39:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -347,6 +347,15 @@ BackgroundWriterMain(void)
 			CreateCheckPoint(false, force_checkpoint);
 
 			/*
+			 * After any checkpoint, close all smgr files.	This is so we
+			 * won't hang onto smgr references to deleted files
+			 * indefinitely. (It is safe to do this because this process
+			 * does not have a relcache, and so no dangling references
+			 * could remain.)
+			 */
+			smgrcloseall();
+
+			/*
 			 * Indicate checkpoint completion to any waiting backends.
 			 */
 			BgWriterShmem->ckpt_done = BgWriterShmem->ckpt_started;
@@ -359,15 +368,6 @@ BackgroundWriterMain(void)
 			 */
 			last_checkpoint_time = now;
 
-			/*
-			 * After any checkpoint, close all smgr files.	This is so we
-			 * won't hang onto smgr references to deleted files
-			 * indefinitely. (It is safe to do this because this process
-			 * does not have a relcache, and so no dangling references
-			 * could remain.)
-			 */
-			smgrcloseall();
-
 			/* Nap for configured time before rechecking */
 			n = 1;
 		}