NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit611fed3

committed

Reset 'ps' display just once when resolving VXID conflicts.

This prevents the word "waiting" from briefly disappearing from the psstatus line when ResolveRecoveryConflictWithVirtualXIDs begins a newiteration of the outer loop.Along the way, remove some useless pgstat_report_waiting() calls;the startup process doesn't appear in pg_stat_activity.Fujii Masao

1 parentdf142bf commit611fed3Copy full SHA for 611fed3

File tree

1 file changed

+13

-17

lines changed

src/backend/storage/ipc
- standby.c

1 file changed

+13

-17

lines changed

`‎src/backend/storage/ipc/standby.c`

Lines changed: 13 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`#include"access/xact.h"`
`22`	`22`	`#include"access/xlog.h"`
`23`	`23`	`#include"miscadmin.h"`
`24`		`-#include"pgstat.h"`
`25`	`24`	`#include"storage/bufmgr.h"`
`26`	`25`	`#include"storage/lmgr.h"`
`27`	`26`	`#include"storage/proc.h"`
`@@ -191,16 +190,14 @@ static void`
`191`	`190`	`ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId*waitlist,`
`192`	`191`	`ProcSignalReasonreason)`
`193`	`192`	`{`
`194`		`-while (VirtualTransactionIdIsValid(*waitlist))`
`195`		`-{`
`196`		`-TimestampTzwaitStart;`
`197`		`-char*new_status;`
`198`		`-`
`199`		`-pgstat_report_waiting(true);`
	`193`	`+TimestampTzwaitStart;`
	`194`	`+char*new_status;`
`200`	`195`
`201`		`-waitStart=GetCurrentTimestamp();`
`202`		`-new_status=NULL;/* we haven't changed the ps display */`
	`196`	`+waitStart=GetCurrentTimestamp();`
	`197`	`+new_status=NULL;/* we haven't changed the ps display */`
`203`	`198`
	`199`	`+while (VirtualTransactionIdIsValid(*waitlist))`
	`200`	`+{`
`204`	`201`	`/* reset standbyWait_us for each xact we wait for */`
`205`	`202`	`standbyWait_us=STANDBY_INITIAL_WAIT_US;`
`206`	`203`
`@@ -246,17 +243,16 @@ ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId *waitlist,`
`246`	`243`	`}`
`247`	`244`	`}`
`248`	`245`
`249`		`-/* Reset ps display if we changed it */`
`250`		`-if (new_status)`
`251`		`-{`
`252`		`-set_ps_display(new_status, false);`
`253`		`-pfree(new_status);`
`254`		`-}`
`255`		`-pgstat_report_waiting(false);`
`256`		`-`
`257`	`246`	`/* The virtual transaction is gone now, wait for the next one */`
`258`	`247`	`waitlist++;`
`259`	`248`	`}`
	`249`	`+`
	`250`	`+/* Reset ps display if we changed it */`
	`251`	`+if (new_status)`
	`252`	`+{`
	`253`	`+set_ps_display(new_status, false);`
	`254`	`+pfree(new_status);`
	`255`	`+}`
`260`	`256`	`}`
`261`	`257`
`262`	`258`	`void`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit611fed3

File tree

1 file changed

1 file changed

`‎src/backend/storage/ipc/standby.c`

0 commit comments