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

PG-1349 Fix deadlock

tmp
Artem Gavrilov 2025-02-14 19:21:48 +02:00
parent d6d6e9e628
commit 57c609ef4a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pg_stat_monitor.c
View File

@ -1968,6 +1968,9 @@ pgsm_store(pgsmEntry *entry)
* we need to create the entry. * we need to create the entry.
*/ */
LWLockAcquire(pgsm->lock, LW_SHARED); LWLockAcquire(pgsm->lock, LW_SHARED);
PG_TRY();
{
shared_hash_entry = (pgsmEntry *) pgsm_hash_find(get_pgsmHash(), &entry->key, &found); shared_hash_entry = (pgsmEntry *) pgsm_hash_find(get_pgsmHash(), &entry->key, &found);
if (!shared_hash_entry) if (!shared_hash_entry)
@ -2008,8 +2011,6 @@ pgsm_store(pgsmEntry *entry)
} }
PG_CATCH(); PG_CATCH();
{ {
LWLockRelease(pgsm->lock);
if (DsaPointerIsValid(dsa_query_pointer)) if (DsaPointerIsValid(dsa_query_pointer))
dsa_free(query_dsa_area, dsa_query_pointer); dsa_free(query_dsa_area, dsa_query_pointer);
PG_RE_THROW(); PG_RE_THROW();
@ -2082,6 +2083,15 @@ pgsm_store(pgsmEntry *entry)
PGSM_STORE); PGSM_STORE);
memset(&entry->counters, 0, sizeof(entry->counters)); memset(&entry->counters, 0, sizeof(entry->counters));
}
PG_CATCH();
{
HOLD_INTERRUPTS();
LWLockRelease(pgsm->lock);
PG_RE_THROW();
}
PG_END_TRY();
LWLockRelease(pgsm->lock); LWLockRelease(pgsm->lock);
} }