diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2022-09-29 12:14:39 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2022-09-29 12:14:39 -0400 |
commit | d7e39d72ca1c6f188b400d7d58813ff5b5b79064 (patch) | |
tree | fad7ad7d202d0605df7f7bbc66a9dbf85d767204 /src/backend/utils/adt/pgstatfuncs.c | |
parent | d5e3fe682ac327ae2c0682a931f95e946ae13487 (diff) | |
download | postgresql-d7e39d72ca1c6f188b400d7d58813ff5b5b79064.tar.gz postgresql-d7e39d72ca1c6f188b400d7d58813ff5b5b79064.zip |
Use actual backend IDs in pg_stat_get_backend_idset() and friends.
Up to now, the ID values returned by pg_stat_get_backend_idset() and
used by pg_stat_get_backend_activity() and allied functions were just
indexes into a local array of sessions seen by the last stats refresh.
This is problematic for a few reasons. The "ID" of a session can vary
over its existence, which is surprising. Also, while these numbers
often match the "backend ID" used for purposes like temp schema
assignment, that isn't reliably true. We can fairly cheaply switch
things around to make these numbers actually be the sessions' backend
IDs. The added test case illustrates that with this definition, the
temp schema used by a given session can be obtained given its PID.
While here, delete some dead code that guarded against getting
a NULL return from pgstat_fetch_stat_local_beentry(). That can't
happen as long as the caller is careful to pass an in-range array
index, as all the callers are. (This code may not have been dead
when written, but it surely is now.)
Nathan Bossart
Discussion: https://postgr.es/m/20220815205811.GA250990@nathanxps13
Diffstat (limited to 'src/backend/utils/adt/pgstatfuncs.c')
-rw-r--r-- | src/backend/utils/adt/pgstatfuncs.c | 48 |
1 files changed, 17 insertions, 31 deletions
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index be15b4b2e57..eadd8464ff2 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -415,7 +415,6 @@ pg_stat_get_backend_idset(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; int *fctx; - int32 result; /* stuff done only on the first call of the function */ if (SRF_IS_FIRSTCALL()) @@ -424,11 +423,10 @@ pg_stat_get_backend_idset(PG_FUNCTION_ARGS) funcctx = SRF_FIRSTCALL_INIT(); fctx = MemoryContextAlloc(funcctx->multi_call_memory_ctx, - 2 * sizeof(int)); + sizeof(int)); funcctx->user_fctx = fctx; fctx[0] = 0; - fctx[1] = pgstat_fetch_stat_numbackends(); } /* stuff done on every call of the function */ @@ -436,12 +434,22 @@ pg_stat_get_backend_idset(PG_FUNCTION_ARGS) fctx = funcctx->user_fctx; fctx[0] += 1; - result = fctx[0]; - if (result <= fctx[1]) + /* + * We recheck pgstat_fetch_stat_numbackends() each time through, just in + * case the local status data has been refreshed since we started. It's + * plenty cheap enough if not. If a refresh does happen, we'll likely + * miss or duplicate some backend IDs, but we're content not to crash. + * (Refreshing midway through such a query would be problematic usage + * anyway, since the backend IDs we've already returned might no longer + * refer to extant sessions.) + */ + if (fctx[0] <= pgstat_fetch_stat_numbackends()) { /* do when there is more left to send */ - SRF_RETURN_NEXT(funcctx, Int32GetDatum(result)); + LocalPgBackendStatus *local_beentry = pgstat_fetch_stat_local_beentry(fctx[0]); + + SRF_RETURN_NEXT(funcctx, Int32GetDatum(local_beentry->backend_id)); } else { @@ -493,17 +501,13 @@ pg_stat_get_progress_info(PG_FUNCTION_ARGS) int i; local_beentry = pgstat_fetch_stat_local_beentry(curr_backend); - - if (!local_beentry) - continue; - beentry = &local_beentry->backendStatus; /* * Report values for only those backends which are running the given * command. */ - if (!beentry || beentry->st_progress_command != cmdtype) + if (beentry->st_progress_command != cmdtype) continue; /* Value available to all callers */ @@ -558,24 +562,6 @@ pg_stat_get_activity(PG_FUNCTION_ARGS) /* Get the next one in the list */ local_beentry = pgstat_fetch_stat_local_beentry(curr_backend); - if (!local_beentry) - { - int i; - - /* Ignore missing entries if looking for specific PID */ - if (pid != -1) - continue; - - for (i = 0; i < lengthof(nulls); i++) - nulls[i] = true; - - nulls[5] = false; - values[5] = CStringGetTextDatum("<backend information not available>"); - - tuplestore_putvalues(rsinfo->setResult, rsinfo->setDesc, values, nulls); - continue; - } - beentry = &local_beentry->backendStatus; /* If looking for specific PID, ignore all the others */ @@ -1180,9 +1166,9 @@ pg_stat_get_db_numbackends(PG_FUNCTION_ARGS) result = 0; for (beid = 1; beid <= tot_backends; beid++) { - PgBackendStatus *beentry = pgstat_fetch_stat_beentry(beid); + LocalPgBackendStatus *local_beentry = pgstat_fetch_stat_local_beentry(beid); - if (beentry && beentry->st_databaseid == dbid) + if (local_beentry->backendStatus.st_databaseid == dbid) result++; } |