NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit704261e

committed

Improve IO accounting for temp relation writes

Both pgstat_database and pgBufferUsage count IO timing for reads of temporaryrelation blocks into local buffers. However, both failed to count write IOtiming for flushes of dirty local buffers. Fix.Additionally, FlushRelationBuffers() seems to have omitted counting writeIO (both count and timing) stats for both pgstat_database andpgBufferUsage. Fix.Author: Melanie Plageman <melanieplageman@gmail.com>Reviewed-by: Andres Freund <andres@anarazel.de>Discussion:https://postgr.es/m/20230321023451.7rzy4kjj2iktrg2r%40awork3.anarazel.de

1 parentbf5a894 commit704261eCopy full SHA for 704261e

File tree

2 files changed

+33

-0

lines changed

src/backend/storage/buffer
- bufmgr.c
- localbuf.c

2 files changed

+33

-0

lines changed

`‎src/backend/storage/buffer/bufmgr.c‎`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4062,6 +4062,8 @@ FlushRelationBuffers(Relation rel)`
`4062`	`4062`	`{`
`4063`	`4063`	`inti;`
`4064`	`4064`	`BufferDesc*bufHdr;`
	`4065`	`+instr_timeio_start,`
	`4066`	`+io_time;`
`4065`	`4067`
`4066`	`4068`	`if (RelationUsesLocalBuffers(rel))`
`4067`	`4069`	`{`
`@@ -4087,6 +4089,11 @@ FlushRelationBuffers(Relation rel)`
`4087`	`4089`
`4088`	`4090`	`PageSetChecksumInplace(localpage,bufHdr->tag.blockNum);`
`4089`	`4091`
	`4092`	`+if (track_io_timing)`
	`4093`	`+INSTR_TIME_SET_CURRENT(io_start);`
	`4094`	`+else`
	`4095`	`+INSTR_TIME_SET_ZERO(io_start);`
	`4096`	`+`
`4090`	`4097`	`smgrwrite(RelationGetSmgr(rel),`
`4091`	`4098`	`BufTagGetForkNum(&bufHdr->tag),`
`4092`	`4099`	`bufHdr->tag.blockNum,`
`@@ -4098,6 +4105,16 @@ FlushRelationBuffers(Relation rel)`
`4098`	`4105`
`4099`	`4106`	`pgstat_count_io_op(IOOBJECT_TEMP_RELATION,IOCONTEXT_NORMAL,IOOP_WRITE);`
`4100`	`4107`
	`4108`	`+if (track_io_timing)`
	`4109`	`+{`
	`4110`	`+INSTR_TIME_SET_CURRENT(io_time);`
	`4111`	`+INSTR_TIME_SUBTRACT(io_time,io_start);`
	`4112`	`+pgstat_count_buffer_write_time(INSTR_TIME_GET_MICROSEC(io_time));`
	`4113`	`+INSTR_TIME_ADD(pgBufferUsage.blk_write_time,io_time);`
	`4114`	`+}`
	`4115`	`+`
	`4116`	`+pgBufferUsage.local_blks_written++;`
	`4117`	`+`
`4101`	`4118`	`/* Pop the error context stack */`
`4102`	`4119`	`error_context_stack=errcallback.previous;`
`4103`	`4120`	`}`

`‎src/backend/storage/buffer/localbuf.c‎`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,8 @@ GetLocalVictimBuffer(void)`
`176`	`176`	`inttrycounter;`
`177`	`177`	`uint32buf_state;`
`178`	`178`	`BufferDesc*bufHdr;`
	`179`	`+instr_timeio_start,`
	`180`	`+io_time;`
`179`	`181`
`180`	`182`	`ResourceOwnerEnlargeBuffers(CurrentResourceOwner);`
`181`	`183`
`@@ -239,6 +241,11 @@ GetLocalVictimBuffer(void)`
`239`	`241`
`240`	`242`	`PageSetChecksumInplace(localpage,bufHdr->tag.blockNum);`
`241`	`243`
	`244`	`+if (track_io_timing)`
	`245`	`+INSTR_TIME_SET_CURRENT(io_start);`
	`246`	`+else`
	`247`	`+INSTR_TIME_SET_ZERO(io_start);`
	`248`	`+`
`242`	`249`	`/* And write... */`
`243`	`250`	`smgrwrite(oreln,`
`244`	`251`	`BufTagGetForkNum(&bufHdr->tag),`
`@@ -252,6 +259,15 @@ GetLocalVictimBuffer(void)`
`252`	`259`
`253`	`260`	`/* Temporary table I/O does not use Buffer Access Strategies */`
`254`	`261`	`pgstat_count_io_op(IOOBJECT_TEMP_RELATION,IOCONTEXT_NORMAL,IOOP_WRITE);`
	`262`	`+`
	`263`	`+if (track_io_timing)`
	`264`	`+{`
	`265`	`+INSTR_TIME_SET_CURRENT(io_time);`
	`266`	`+INSTR_TIME_SUBTRACT(io_time,io_start);`
	`267`	`+pgstat_count_buffer_write_time(INSTR_TIME_GET_MICROSEC(io_time));`
	`268`	`+INSTR_TIME_ADD(pgBufferUsage.blk_write_time,io_time);`
	`269`	`+}`
	`270`	`+`
`255`	`271`	`pgBufferUsage.local_blks_written++;`
`256`	`272`	`}`
`257`	`273`

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!

Commit704261e

File tree

2 files changed

2 files changed

`‎src/backend/storage/buffer/bufmgr.c‎`

`‎src/backend/storage/buffer/localbuf.c‎`

0 commit comments