Explicitly terminate the running backends after issueing the stop.

James William Pye · James William Pye · commit 9b94cea25abe · 2010-03-13T17:50:44.000-07:00
diff --git a/postgresql/lib/libsys.sql b/postgresql/lib/libsys.sql
@@ -147,6 +147,24 @@ SELECT
  NULL::text AS client_addr,
  NULL::int AS client_port;
 
+[terminate_backends:transient:column]
+-- Terminate all except mine.
+SELECT
+	procpid, pg_catalog.pg_terminate_backend(procpid)
+FROM
+	pg_catalog.pg_stat_activity
+WHERE
+	procpid != pg_catalog.pg_backend_pid()
+
+[cancel_backends:transient:column]
+-- Cancel all except mine.
+SELECT
+	procpid, pg_catalog.pg_cancel_backend(procpid)
+FROM
+	pg_catalog.pg_stat_activity
+WHERE
+	procpid != pg_catalog.pg_backend_pid()
+
 [sizeof_db:transient:first]
 SELECT pg_catalog.pg_database_size(current_database())::bigint
 
diff --git a/postgresql/temporal.py b/postgresql/temporal.py
@@ -56,9 +56,12 @@ def incontext(*args, **kw):
 			incontext.__name__ = n
 		return incontext
 
-	def reset(self):
-		# Don't reset if it's not the initializing process.
+	def destroy(self):
+		# Don't destroy if it's not the initializing process.
 		if os.getpid() == self._init_pid_:
+			with self:
+				# Kill all the open connections.
+				db.sys.terminate_backends()
 			cluster = self.cluster
 			self.cluster = None
 			self._init_pid_ = None
@@ -80,7 +83,7 @@ def init(self,
 		# Hasn't been created yet, but doesn't matter.
 		# On exit, obliterate the cluster directory.
 		self._init_pid_ = os.getpid()
-		atexit.register(self.reset)
+		atexit.register(self.destroy)
 
 		# [$HOME|.]/.pg_tmpdb_{pid}
 		self.cluster_path = os.path.join(
