Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8e8a0be

Browse files
committed
Unify several ways to tracking backend type
Add a new global variable MyBackendType that uses the same BackendTypeenum that was previously only used by the stats collector. That wayseveral duplicate ways of checking what type a particular process iscan be simplified. Since it's no longer just for stats, move tomiscinit.c and rename existing functions to match the expandedpurpose.Reviewed-by: Julien Rouhaud <rjuju123@gmail.com>Reviewed-by: Kuntal Ghosh <kuntalghosh.2007@gmail.com>Reviewed-by: Alvaro Herrera <alvherre@2ndquadrant.com>Discussion:https://www.postgresql.org/message-id/flat/c65e5196-4f04-4ead-9353-6088c19615a3@2ndquadrant.com
1 parent1cc9c24 commit8e8a0be

File tree

12 files changed

+126
-164
lines changed

12 files changed

+126
-164
lines changed

‎src/backend/bootstrap/bootstrap.c‎

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -314,36 +314,28 @@ AuxiliaryProcessMain(int argc, char *argv[])
314314
proc_exit(1);
315315
}
316316

317-
/*
318-
* Identify myself via ps
319-
*/
320-
if (IsUnderPostmaster)
317+
switch (MyAuxProcType)
321318
{
322-
constchar*statmsg;
323-
324-
switch (MyAuxProcType)
325-
{
326-
caseStartupProcess:
327-
statmsg=pgstat_get_backend_desc(B_STARTUP);
328-
break;
329-
caseBgWriterProcess:
330-
statmsg=pgstat_get_backend_desc(B_BG_WRITER);
331-
break;
332-
caseCheckpointerProcess:
333-
statmsg=pgstat_get_backend_desc(B_CHECKPOINTER);
334-
break;
335-
caseWalWriterProcess:
336-
statmsg=pgstat_get_backend_desc(B_WAL_WRITER);
337-
break;
338-
caseWalReceiverProcess:
339-
statmsg=pgstat_get_backend_desc(B_WAL_RECEIVER);
340-
break;
341-
default:
342-
statmsg="??? process";
343-
break;
344-
}
345-
init_ps_display(statmsg);
319+
caseStartupProcess:
320+
MyBackendType=B_STARTUP;
321+
break;
322+
caseBgWriterProcess:
323+
MyBackendType=B_BG_WRITER;
324+
break;
325+
caseCheckpointerProcess:
326+
MyBackendType=B_CHECKPOINTER;
327+
break;
328+
caseWalWriterProcess:
329+
MyBackendType=B_WAL_WRITER;
330+
break;
331+
caseWalReceiverProcess:
332+
MyBackendType=B_WAL_RECEIVER;
333+
break;
334+
default:
335+
MyBackendType=B_INVALID;
346336
}
337+
if (IsUnderPostmaster)
338+
init_ps_display(NULL);
347339

348340
/* Acquire configuration parameters, unless inherited from postmaster */
349341
if (!IsUnderPostmaster)

‎src/backend/postmaster/autovacuum.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,8 @@ AutoVacLauncherMain(int argc, char *argv[])
433433

434434
am_autovacuum_launcher= true;
435435

436-
/* Identify myself via ps */
437-
init_ps_display(pgstat_get_backend_desc(B_AUTOVAC_LAUNCHER));
436+
MyBackendType=B_AUTOVAC_LAUNCHER;
437+
init_ps_display(NULL);
438438

439439
ereport(DEBUG1,
440440
(errmsg("autovacuum launcher started")));
@@ -1506,8 +1506,8 @@ AutoVacWorkerMain(int argc, char *argv[])
15061506

15071507
am_autovacuum_worker= true;
15081508

1509-
/* Identify myself via ps */
1510-
init_ps_display(pgstat_get_backend_desc(B_AUTOVAC_WORKER));
1509+
MyBackendType=B_AUTOVAC_WORKER;
1510+
init_ps_display(NULL);
15111511

15121512
SetProcessingMode(InitProcessing);
15131513

‎src/backend/postmaster/bgworker.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ StartBackgroundWorker(void)
688688

689689
IsBackgroundWorker= true;
690690

691-
/* Identify myself via ps */
691+
MyBackendType=B_BG_WORKER;
692692
init_ps_display(worker->bgw_name);
693693

694694
/*

‎src/backend/postmaster/pgarch.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,8 @@ PgArchiverMain(int argc, char *argv[])
238238
pqsignal(SIGCHLD,SIG_DFL);
239239
PG_SETMASK(&UnBlockSig);
240240

241-
/*
242-
* Identify myself via ps
243-
*/
244-
init_ps_display("archiver");
241+
MyBackendType=B_ARCHIVER;
242+
init_ps_display(NULL);
245243

246244
pgarch_MainLoop();
247245

‎src/backend/postmaster/pgstat.c‎

Lines changed: 3 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -2892,62 +2892,7 @@ pgstat_bestart(void)
28922892
* out-of-line data. Those have to be handled separately, below.
28932893
*/
28942894
lbeentry.st_procpid=MyProcPid;
2895-
2896-
if (MyBackendId!=InvalidBackendId)
2897-
{
2898-
if (IsAutoVacuumLauncherProcess())
2899-
{
2900-
/* Autovacuum Launcher */
2901-
lbeentry.st_backendType=B_AUTOVAC_LAUNCHER;
2902-
}
2903-
elseif (IsAutoVacuumWorkerProcess())
2904-
{
2905-
/* Autovacuum Worker */
2906-
lbeentry.st_backendType=B_AUTOVAC_WORKER;
2907-
}
2908-
elseif (am_walsender)
2909-
{
2910-
/* Wal sender */
2911-
lbeentry.st_backendType=B_WAL_SENDER;
2912-
}
2913-
elseif (IsBackgroundWorker)
2914-
{
2915-
/* bgworker */
2916-
lbeentry.st_backendType=B_BG_WORKER;
2917-
}
2918-
else
2919-
{
2920-
/* client-backend */
2921-
lbeentry.st_backendType=B_BACKEND;
2922-
}
2923-
}
2924-
else
2925-
{
2926-
/* Must be an auxiliary process */
2927-
Assert(MyAuxProcType!=NotAnAuxProcess);
2928-
switch (MyAuxProcType)
2929-
{
2930-
caseStartupProcess:
2931-
lbeentry.st_backendType=B_STARTUP;
2932-
break;
2933-
caseBgWriterProcess:
2934-
lbeentry.st_backendType=B_BG_WRITER;
2935-
break;
2936-
caseCheckpointerProcess:
2937-
lbeentry.st_backendType=B_CHECKPOINTER;
2938-
break;
2939-
caseWalWriterProcess:
2940-
lbeentry.st_backendType=B_WAL_WRITER;
2941-
break;
2942-
caseWalReceiverProcess:
2943-
lbeentry.st_backendType=B_WAL_RECEIVER;
2944-
break;
2945-
default:
2946-
elog(FATAL,"unrecognized process type: %d",
2947-
(int)MyAuxProcType);
2948-
}
2949-
}
2950-
2895+
lbeentry.st_backendType=MyBackendType;
29512896
lbeentry.st_proc_start_timestamp=MyStartTimestamp;
29522897
lbeentry.st_activity_start_timestamp=0;
29532898
lbeentry.st_state_start_timestamp=0;
@@ -4269,48 +4214,6 @@ pgstat_get_crashed_backend_activity(int pid, char *buffer, int buflen)
42694214
returnNULL;
42704215
}
42714216

4272-
constchar*
4273-
pgstat_get_backend_desc(BackendTypebackendType)
4274-
{
4275-
constchar*backendDesc="unknown process type";
4276-
4277-
switch (backendType)
4278-
{
4279-
caseB_AUTOVAC_LAUNCHER:
4280-
backendDesc="autovacuum launcher";
4281-
break;
4282-
caseB_AUTOVAC_WORKER:
4283-
backendDesc="autovacuum worker";
4284-
break;
4285-
caseB_BACKEND:
4286-
backendDesc="client backend";
4287-
break;
4288-
caseB_BG_WORKER:
4289-
backendDesc="background worker";
4290-
break;
4291-
caseB_BG_WRITER:
4292-
backendDesc="background writer";
4293-
break;
4294-
caseB_CHECKPOINTER:
4295-
backendDesc="checkpointer";
4296-
break;
4297-
caseB_STARTUP:
4298-
backendDesc="startup";
4299-
break;
4300-
caseB_WAL_RECEIVER:
4301-
backendDesc="walreceiver";
4302-
break;
4303-
caseB_WAL_SENDER:
4304-
backendDesc="walsender";
4305-
break;
4306-
caseB_WAL_WRITER:
4307-
backendDesc="walwriter";
4308-
break;
4309-
}
4310-
4311-
returnbackendDesc;
4312-
}
4313-
43144217
/* ------------------------------------------------------------
43154218
* Local support functions follow
43164219
* ------------------------------------------------------------
@@ -4447,10 +4350,8 @@ PgstatCollectorMain(int argc, char *argv[])
44474350
pqsignal(SIGCHLD,SIG_DFL);
44484351
PG_SETMASK(&UnBlockSig);
44494352

4450-
/*
4451-
* Identify myself via ps
4452-
*/
4453-
init_ps_display("stats collector");
4353+
MyBackendType=B_STATS_COLLECTOR;
4354+
init_ps_display(NULL);
44544355

44554356
/*
44564357
* Read in existing stats files or initialize the stats to zero.

‎src/backend/postmaster/postmaster.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2259,6 +2259,11 @@ ProcessStartupPacket(Port *port, bool secure_done)
22592259
if (strlen(port->user_name) >=NAMEDATALEN)
22602260
port->user_name[NAMEDATALEN-1]='\0';
22612261

2262+
if (am_walsender)
2263+
MyBackendType=B_WAL_SENDER;
2264+
else
2265+
MyBackendType=B_BACKEND;
2266+
22622267
/*
22632268
* Normal walsender backends, e.g. for streaming replication, are not
22642269
* connected to a particular database. But walsenders used for logical
@@ -4422,7 +4427,7 @@ BackendInitialize(Port *port)
44224427
*/
44234428
initStringInfo(&ps_data);
44244429
if (am_walsender)
4425-
appendStringInfo(&ps_data,"%s ",pgstat_get_backend_desc(B_WAL_SENDER));
4430+
appendStringInfo(&ps_data,"%s ",GetBackendTypeDesc(B_WAL_SENDER));
44264431
appendStringInfo(&ps_data,"%s ",port->user_name);
44274432
if (!am_walsender)
44284433
appendStringInfo(&ps_data,"%s ",port->database_name);

‎src/backend/postmaster/syslogger.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ SysLoggerMain(int argc, char *argv[])
179179

180180
am_syslogger= true;
181181

182-
init_ps_display("logger");
182+
MyBackendType=B_LOGGER;
183+
init_ps_display(NULL);
183184

184185
/*
185186
* If we restarted, our stderr is already redirected into our own input

‎src/backend/utils/adt/pgstatfuncs.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
841841
}
842842
else
843843
values[17]=
844-
CStringGetTextDatum(pgstat_get_backend_desc(beentry->st_backendType));
844+
CStringGetTextDatum(GetBackendTypeDesc(beentry->st_backendType));
845845

846846
/* SSL information */
847847
if (beentry->st_ssl)

‎src/backend/utils/init/miscinit.c‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757

5858
ProcessingModeMode=InitProcessing;
5959

60+
BackendTypeMyBackendType;
61+
6062
/* List of lock files to be removed at proc exit */
6163
staticList*lock_files=NIL;
6264

@@ -187,6 +189,59 @@ SwitchBackToLocalLatch(void)
187189
SetLatch(MyLatch);
188190
}
189191

192+
constchar*
193+
GetBackendTypeDesc(BackendTypebackendType)
194+
{
195+
constchar*backendDesc="unknown process type";
196+
197+
switch (backendType)
198+
{
199+
caseB_INVALID:
200+
backendDesc="not initialized";
201+
break;
202+
caseB_AUTOVAC_LAUNCHER:
203+
backendDesc="autovacuum launcher";
204+
break;
205+
caseB_AUTOVAC_WORKER:
206+
backendDesc="autovacuum worker";
207+
break;
208+
caseB_BACKEND:
209+
backendDesc="client backend";
210+
break;
211+
caseB_BG_WORKER:
212+
backendDesc="background worker";
213+
break;
214+
caseB_BG_WRITER:
215+
backendDesc="background writer";
216+
break;
217+
caseB_CHECKPOINTER:
218+
backendDesc="checkpointer";
219+
break;
220+
caseB_STARTUP:
221+
backendDesc="startup";
222+
break;
223+
caseB_WAL_RECEIVER:
224+
backendDesc="walreceiver";
225+
break;
226+
caseB_WAL_SENDER:
227+
backendDesc="walsender";
228+
break;
229+
caseB_WAL_WRITER:
230+
backendDesc="walwriter";
231+
break;
232+
caseB_ARCHIVER:
233+
backendDesc="archiver";
234+
break;
235+
caseB_STATS_COLLECTOR:
236+
backendDesc="stats collector";
237+
break;
238+
caseB_LOGGER:
239+
backendDesc="logger";
240+
break;
241+
}
242+
243+
returnbackendDesc;
244+
}
190245

191246
/* ----------------------------------------------------------------
192247
*database path / name support stuff

‎src/backend/utils/misc/ps_status.c‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#include"libpq/libpq.h"
3030
#include"miscadmin.h"
31+
#include"pgstat.h"
3132
#include"utils/guc.h"
3233
#include"utils/ps_status.h"
3334

@@ -247,14 +248,20 @@ save_ps_display_args(int argc, char **argv)
247248

248249
/*
249250
* Call this once during subprocess startup to set the identification
250-
* values. At this point, the original argv[] array may be overwritten.
251+
* values.
252+
*
253+
* If fixed_part is NULL, a default will be obtained from MyBackendType.
254+
*
255+
* At this point, the original argv[] array may be overwritten.
251256
*/
252257
void
253258
init_ps_display(constchar*fixed_part)
254259
{
255260
boolsave_update_process_title;
256261

257-
Assert(fixed_part);
262+
Assert(fixed_part||MyBackendType);
263+
if (!fixed_part)
264+
fixed_part=GetBackendTypeDesc(MyBackendType);
258265

259266
#ifndefPS_USE_NONE
260267
/* no ps display for stand-alone backend */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp