Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0f92b23

Browse files
committed
Fix DROP DATABASE for databases with many ACLs
Commit c66a7d7 modified DROP DATABASE so that if interrupted, the database is known to be in an invalid state and can only be dropped. This is done by setting a flag using an in-place update, so that it's not lost in case of rollback. For databases with many ACLs, this may however fail like this: ERROR: wrong tuple length This happens because with many ACLs, the pg_database.datacl attribute gets TOASTed. The dropdb() code reads the tuple from the syscache, which means it's detoasted. But the in-place update expects the tuple length to match the on-disk tuple. Fixed by reading the tuple from the catalog directly, not from syscache. Report and fix by Ayush Tiwari. Backpatch to 12. The DROP DATABASE fix was backpatched to 11, but 11 is EOL at this point. Reported-by: Ayush Tiwari Author: Ayush Tiwari Reviewed-by: Tomas Vondra Backpatch-through: 12 Discussion: https://postgr.es/m/CAJTYsWWNkCt+-UnMhg=BiCD3Mh8c2JdHLofPxsW3m2dkDFw8RA@mail.gmail.com
1 parent d426718 commit 0f92b23

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

src/backend/commands/dbcommands.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1650,6 +1650,8 @@ dropdb(const char *dbname, bool missing_ok, bool force)
16501650
bool db_istemplate;
16511651
Relation pgdbrel;
16521652
HeapTuple tup;
1653+
ScanKeyData scankey;
1654+
SysScanDesc scan;
16531655
Form_pg_database datform;
16541656
int notherbackends;
16551657
int npreparedxacts;
@@ -1787,7 +1789,18 @@ dropdb(const char *dbname, bool missing_ok, bool force)
17871789
*/
17881790
pgstat_drop_database(db_id);
17891791

1790-
tup = SearchSysCacheCopy1(DATABASEOID, ObjectIdGetDatum(db_id));
1792+
/*
1793+
* Update the database's pg_database tuple
1794+
*/
1795+
ScanKeyInit(&scankey,
1796+
Anum_pg_database_datname,
1797+
BTEqualStrategyNumber, F_NAMEEQ,
1798+
CStringGetDatum(dbname));
1799+
1800+
scan = systable_beginscan(pgdbrel, DatabaseNameIndexId, true,
1801+
NULL, 1, &scankey);
1802+
1803+
tup = systable_getnext(scan);
17911804
if (!HeapTupleIsValid(tup))
17921805
elog(ERROR, "cache lookup failed for database %u", db_id);
17931806
datform = (Form_pg_database) GETSTRUCT(tup);
@@ -1813,6 +1826,8 @@ dropdb(const char *dbname, bool missing_ok, bool force)
18131826
*/
18141827
CatalogTupleDelete(pgdbrel, &tup->t_self);
18151828

1829+
systable_endscan(scan);
1830+
18161831
/*
18171832
* Drop db-specific replication slots.
18181833
*/

0 commit comments

Comments
 (0)