From 991b29dadbb82ccd9afc65b8f1f8a6d48afd1a6d Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Sat, 9 Nov 2019 17:28:27 +0530 Subject: [PATCH] Rearrange dropdb() to avoid errors after allowing other sessions to exit. During Drop Database, it is better to error out before allowing other sessions to exit and forcefully terminating autovacuum workers. All the other errors except for checking subscriptions are done before. Author: Amit Kapila Discussion: https://postgr.es/m/CAA4eK1+qhLkCYG2oy9xug9ur_j=G2wQNRYAyd+-kZfZ1z42pLw@mail.gmail.com --- src/backend/commands/dbcommands.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 01d6621..4ad62e6 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -897,19 +897,6 @@ dropdb(const char *dbname, bool missing_ok) } /* - * Check for other backends in the target database. (Because we hold the - * database lock, no new ones can start after this.) - * - * As in CREATE DATABASE, check this after other error conditions. - */ - if (CountOtherDBBackends(db_id, ¬herbackends, &npreparedxacts)) - ereport(ERROR, - (errcode(ERRCODE_OBJECT_IN_USE), - errmsg("database \"%s\" is being accessed by other users", - dbname), - errdetail_busy_db(notherbackends, npreparedxacts))); - - /* * Check if there are subscriptions defined in the target database. * * We can't drop them automatically because they might be holding @@ -925,6 +912,19 @@ dropdb(const char *dbname, bool missing_ok) nsubscriptions, nsubscriptions))); /* + * Check for other backends in the target database. (Because we hold the + * database lock, no new ones can start after this.) + * + * As in CREATE DATABASE, check this after other error conditions. + */ + if (CountOtherDBBackends(db_id, ¬herbackends, &npreparedxacts)) + ereport(ERROR, + (errcode(ERRCODE_OBJECT_IN_USE), + errmsg("database \"%s\" is being accessed by other users", + dbname), + errdetail_busy_db(notherbackends, npreparedxacts))); + + /* * Remove the database's tuple from pg_database. */ tup = SearchSysCache1(DATABASEOID, ObjectIdGetDatum(db_id)); -- 1.8.3.1