summaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2013-04-03 14:13:34 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2013-04-03 14:13:34 -0400
commita0c2492b957a7e89b997d03d0d62f37fee7aafdf (patch)
treeaa3af87e3208b6256cb45b48691d955f2266be60 /src/backend/utils
parente084b1446ffa9ec09c3774221011ed686a8b1e7d (diff)
Avoid updating our PgBackendStatus entry when track_activities is off.
The point of turning off track_activities is to avoid this reporting overhead, but a thinko in commit 4f42b546fd87a80be30c53a0f2c897acb826ad52 caused pgstat_report_activity() to perform half of its updates anyway. Fix that, and also make sure that we clear all the now-disabled fields when transitioning to the non-reporting state.
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/pgstatfuncs.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 7c0705abcc9..6f251474857 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -665,15 +665,8 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
nulls[4] = true;
break;
}
- if (beentry->st_state == STATE_UNDEFINED ||
- beentry->st_state == STATE_DISABLED)
- {
- values[5] = CStringGetTextDatum("");
- }
- else
- {
- values[5] = CStringGetTextDatum(beentry->st_activity);
- }
+
+ values[5] = CStringGetTextDatum(beentry->st_activity);
values[6] = BoolGetDatum(beentry->st_waiting);
if (beentry->st_xact_start_timestamp != 0)