Skip to content

Commit

Permalink
Fix DROP DATABASE for databases with many ACLs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tvondra committed Aug 18, 2024
1 parent d426718 commit 0f92b23
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion src/backend/commands/dbcommands.c
Original file line number Diff line number Diff line change
Expand Up @@ -1650,6 +1650,8 @@ dropdb(const char *dbname, bool missing_ok, bool force)
bool db_istemplate;
Relation pgdbrel;
HeapTuple tup;
ScanKeyData scankey;
SysScanDesc scan;
Form_pg_database datform;
int notherbackends;
int npreparedxacts;
Expand Down Expand Up @@ -1787,7 +1789,18 @@ dropdb(const char *dbname, bool missing_ok, bool force)
*/
pgstat_drop_database(db_id);

tup = SearchSysCacheCopy1(DATABASEOID, ObjectIdGetDatum(db_id));
/*
* Update the database's pg_database tuple
*/
ScanKeyInit(&scankey,
Anum_pg_database_datname,
BTEqualStrategyNumber, F_NAMEEQ,
CStringGetDatum(dbname));

scan = systable_beginscan(pgdbrel, DatabaseNameIndexId, true,
NULL, 1, &scankey);

tup = systable_getnext(scan);
if (!HeapTupleIsValid(tup))
elog(ERROR, "cache lookup failed for database %u", db_id);
datform = (Form_pg_database) GETSTRUCT(tup);
Expand All @@ -1813,6 +1826,8 @@ dropdb(const char *dbname, bool missing_ok, bool force)
*/
CatalogTupleDelete(pgdbrel, &tup->t_self);

systable_endscan(scan);

/*
* Drop db-specific replication slots.
*/
Expand Down

0 comments on commit 0f92b23

Please sign in to comment.