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

Merge pull request #101 from darkfronza/PG-225_fix_deadlock 

PG-225: Fix deadlock in pgss_store.
pull/102/head
Ibrar Ahmed 2021-09-06 15:08:19 +05:00 committed by GitHub
parent e541633670 eafb2e89a8
commit bd4ae3ec37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hash_query.c
View File

@ -147,7 +147,7 @@ hash_entry_alloc(pgssSharedState *pgss, pgssHashKey *key,int encoding)
return NULL;
}
/* Find or create an entry with desired hash code */
entry = (pgssEntry *) hash_search(pgss_hash, key, HASH_ENTER, &found);
entry = (pgssEntry *) hash_search(pgss_hash, key, HASH_ENTER_NULL, &found);
if (!found)
{
pgss->bucket_entry[pgss->current_wbucket]++;
@ -285,7 +285,7 @@ hash_create_query_entry(uint64 bucket_id, uint64 queryid, uint64 dbid, uint64 us
key.ip = ip;
key.appid = appid;
entry = (pgssQueryEntry *) hash_search(pgss_query_hash, &key, HASH_ENTER, &found);
entry = (pgssQueryEntry *) hash_search(pgss_query_hash, &key, HASH_ENTER_NULL, &found);
return entry;
}

9
pg_stat_monitor.c
View File

@ -1499,6 +1499,7 @@ pgss_store(uint64 queryid,
uint64 planid = plan_info ? plan_info->planid: 0;
uint64 appid = djb2_hash((unsigned char *)application_name, application_name_len);
char comments[512] = "";
bool out_of_memory = false;
/* Monitoring is disabled */
if (!PGSM_ENABLED)
return;
@ -1532,7 +1533,7 @@ pgss_store(uint64 queryid,
pgssQueryEntry *query_entry;
query_entry = pgss_store_query_info(bucketid, queryid, dbid, userid, ip, appid, query, strlen(query), kind);
if (query_entry == NULL)
elog(DEBUG1, "pg_stat_monitor: out of memory");
out_of_memory = true;
break;
}
case PGSS_ERROR:
@ -1543,13 +1544,13 @@ pgss_store(uint64 queryid,
query_entry = pgss_store_query_info(bucketid, queryid, dbid, userid, ip, appid, query, strlen(query), kind);
if (query_entry == NULL)
{
elog(DEBUG1, "pg_stat_monitor: out of memory");
out_of_memory = true;
break;
}
entry = pgss_get_entry(bucketid, userid, dbid, queryid, ip, planid, appid);
if (entry == NULL)
{
elog(DEBUG1, "pg_stat_monitor: out of memory");
out_of_memory = true;
break;
}
@ -1576,6 +1577,8 @@ pgss_store(uint64 queryid,
break;
}
LWLockRelease(pgss->lock);
if (out_of_memory)
elog(DEBUG1, "pg_stat_monitor: out of memory");
}
/*
* Reset all statement statistics.