external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in regress

pull/7254/head
EmelSimsek 2023-10-18 12:21:55 +03:00 committed by Emel Şimşek
parent d076b43000
commit 3d88054290
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/distributed/utils/maintenanced.c
View File

@ -339,9 +339,12 @@ CitusMaintenanceDaemonMain(Datum main_arg)
MaintenanceDaemonDBData *myDbData = NULL; MaintenanceDaemonDBData *myDbData = NULL;
bool isMainDb = false;
if (databaseOid == 0) if (databaseOid == 0)
{ {
char *databaseName = MainDb; char *databaseName = MainDb;
isMainDb = true;
BackgroundWorkerInitializeConnection(databaseName, NULL, 0); BackgroundWorkerInitializeConnection(databaseName, NULL, 0);
@ -422,7 +425,6 @@ CitusMaintenanceDaemonMain(Datum main_arg)
before_shmem_exit(MaintenanceDaemonShmemExit, main_arg); before_shmem_exit(MaintenanceDaemonShmemExit, main_arg);
BackgroundWorkerInitializeConnectionByOid(databaseOid, myDbData->userOid, 0);
} }
/* /*
@ -472,6 +474,10 @@ CitusMaintenanceDaemonMain(Datum main_arg)
elog(LOG, "starting maintenance daemon on database %u user %u", elog(LOG, "starting maintenance daemon on database %u user %u",
databaseOid, myDbData->userOid); databaseOid, myDbData->userOid);
if (!isMainDb) {
BackgroundWorkerInitializeConnectionByOid(databaseOid, myDbData->userOid, 0);
}
/* make worker recognizable in pg_stat_activity */ /* make worker recognizable in pg_stat_activity */
pgstat_report_appname("Citus Maintenance Daemon"); pgstat_report_appname("Citus Maintenance Daemon");