diff options
| author | Tom Lane | 2019-05-07 15:41:37 +0000 |
|---|---|---|
| committer | Tom Lane | 2019-05-07 15:41:37 +0000 |
| commit | 8d0ddccec6366a2851da7d350b33659203aa644b (patch) | |
| tree | 6cf111487dca2ba88d89c88de4fb95c42810dc63 | |
| parent | b753bc0c84e51c200ec7de6cefb6f689d13fef62 (diff) | |
Avoid "invalid memory alloc request size" while reading pg_stat_activity.
On a 64-bit machine, if you set track_activity_query_size and
max_connections such that their product exceeds 1GB, shared memory
setup will still succeed (given enough RAM), but attempts to read
pg_stat_activity fail with "invalid memory alloc request size".
Work around that by using MemoryContextAllocHuge to allocate the
local copy of the activity strings. Using the "huge" API costs us
nothing extra in normal cases, and it seems better than throwing
an error and/or explaining to people why they can't do this.
This situation seems insanely profligate today, but who knows what
people will consider normal in ten or twenty years? So let's fix it
in HEAD but not worry about a back-patch.
Per report from James Tomson.
Discussion: https://postgr.es/m/[email protected]
| -rw-r--r-- | src/backend/postmaster/pgstat.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 4cfae15d3a..64986b17c8 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -3319,6 +3319,14 @@ pgstat_read_current_status(void) pgstat_setup_memcxt(); + /* + * Allocate storage for local copy of state data. We can presume that + * none of these requests overflow size_t, because we already calculated + * the same values using mul_size during shmem setup. However, with + * probably-silly values of pgstat_track_activity_query_size and + * max_connections, the localactivity buffer could exceed 1GB, so use + * "huge" allocation for that one. + */ localtable = (LocalPgBackendStatus *) MemoryContextAlloc(pgStatLocalContext, sizeof(LocalPgBackendStatus) * NumBackendStatSlots); @@ -3329,8 +3337,8 @@ pgstat_read_current_status(void) MemoryContextAlloc(pgStatLocalContext, NAMEDATALEN * NumBackendStatSlots); localactivity = (char *) - MemoryContextAlloc(pgStatLocalContext, - pgstat_track_activity_query_size * NumBackendStatSlots); + MemoryContextAllocHuge(pgStatLocalContext, + pgstat_track_activity_query_size * NumBackendStatSlots); #ifdef USE_SSL localsslstatus = (PgBackendSSLStatus *) MemoryContextAlloc(pgStatLocalContext, |