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

Commit8aaa04b

Browse files
committed
Track shared buffer hits in pg_stat_io
Among other things, this should make it easier to calculate a useful cache hitratio by excluding buffer reads via buffer access strategies. As buffer accessstrategies reuse buffers (and thus evict the prior buffer contents), it isnormal to see reads on repeated scans of the same data.Author: Melanie Plageman <melanieplageman@gmail.com>Reviewed-by: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>Reviewed-by: Andres Freund <andres@anarazel.de>Discussion:https://postgr.es/m/CAAKRu_beMa9Hzih40%3DXPYqhDVz6tsgUGTrhZXRo%3Dunp%2Bszb%3DUA%40mail.gmail.com
1 parent6c3b697 commit8aaa04b

File tree

12 files changed

+109
-47
lines changed

12 files changed

+109
-47
lines changed

‎doc/src/sgml/monitoring.sgml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3855,6 +3855,17 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
38553855
</entry>
38563856
</row>
38573857

3858+
<row>
3859+
<entry role="catalog_table_entry">
3860+
<para role="column_definition">
3861+
<structfield>hits</structfield> <type>bigint</type>
3862+
</para>
3863+
<para>
3864+
The number of times a desired block was found in a shared buffer.
3865+
</para>
3866+
</entry>
3867+
</row>
3868+
38583869
<row>
38593870
<entry role="catalog_table_entry">
38603871
<para role="column_definition">

‎src/backend/catalog/system_views.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,7 @@ SELECT
11281128
b.writes,
11291129
b.extends,
11301130
b.op_bytes,
1131+
b.hits,
11311132
b.evictions,
11321133
b.reuses,
11331134
b.fsyncs,

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

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ static BufferDesc *BufferAlloc(SMgrRelation smgr,
472472
ForkNumberforkNum,
473473
BlockNumberblockNum,
474474
BufferAccessStrategystrategy,
475-
bool*foundPtr,IOContext*io_context);
475+
bool*foundPtr,IOContextio_context);
476476
staticvoidFlushBuffer(BufferDesc*buf,SMgrRelationreln,
477477
IOObjectio_object,IOContextio_context);
478478
staticvoidFindAndDropRelationBuffers(RelFileLocatorrlocator,
@@ -850,13 +850,14 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
850850
if (isLocalBuf)
851851
{
852852
/*
853-
* LocalBufferAlloc() will set the io_context to IOCONTEXT_NORMAL. We
854-
* do not use a BufferAccessStrategy for I/O of temporary tables.
853+
* We do not use a BufferAccessStrategy for I/O of temporary tables.
855854
* However, in some cases, the "strategy" may not be NULL, so we can't
856855
* rely on IOContextForStrategy() to set the right IOContext for us.
857856
* This may happen in cases like CREATE TEMPORARY TABLE AS...
858857
*/
859-
bufHdr=LocalBufferAlloc(smgr,forkNum,blockNum,&found,&io_context);
858+
io_context=IOCONTEXT_NORMAL;
859+
io_object=IOOBJECT_TEMP_RELATION;
860+
bufHdr=LocalBufferAlloc(smgr,forkNum,blockNum,&found);
860861
if (found)
861862
pgBufferUsage.local_blks_hit++;
862863
elseif (isExtend)
@@ -871,8 +872,10 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
871872
* lookup the buffer. IO_IN_PROGRESS is set if the requested block is
872873
* not currently in memory.
873874
*/
875+
io_context=IOContextForStrategy(strategy);
876+
io_object=IOOBJECT_RELATION;
874877
bufHdr=BufferAlloc(smgr,relpersistence,forkNum,blockNum,
875-
strategy,&found,&io_context);
878+
strategy,&found,io_context);
876879
if (found)
877880
pgBufferUsage.shared_blks_hit++;
878881
elseif (isExtend)
@@ -892,6 +895,7 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
892895
/* Just need to update stats before we exit */
893896
*hit= true;
894897
VacuumPageHit++;
898+
pgstat_count_io_op(io_object,io_context,IOOP_HIT);
895899

896900
if (VacuumCostActive)
897901
VacuumCostBalance+=VacuumCostPageHit;
@@ -987,16 +991,7 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
987991
*/
988992
Assert(!(pg_atomic_read_u32(&bufHdr->state)&BM_VALID));/* spinlock not needed */
989993

990-
if (isLocalBuf)
991-
{
992-
bufBlock=LocalBufHdrGetBlock(bufHdr);
993-
io_object=IOOBJECT_TEMP_RELATION;
994-
}
995-
else
996-
{
997-
bufBlock=BufHdrGetBlock(bufHdr);
998-
io_object=IOOBJECT_RELATION;
999-
}
994+
bufBlock=isLocalBuf ?LocalBufHdrGetBlock(bufHdr) :BufHdrGetBlock(bufHdr);
1000995

1001996
if (isExtend)
1002997
{
@@ -1139,7 +1134,7 @@ static BufferDesc *
11391134
BufferAlloc(SMgrRelationsmgr,charrelpersistence,ForkNumberforkNum,
11401135
BlockNumberblockNum,
11411136
BufferAccessStrategystrategy,
1142-
bool*foundPtr,IOContext*io_context)
1137+
bool*foundPtr,IOContextio_context)
11431138
{
11441139
boolfrom_ring;
11451140
BufferTagnewTag;/* identity of requested block */
@@ -1193,11 +1188,8 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
11931188
{
11941189
/*
11951190
* If we get here, previous attempts to read the buffer must
1196-
* have failed ... but we shall bravely try again. Set
1197-
* io_context since we will in fact need to count an IO
1198-
* Operation.
1191+
* have failed ... but we shall bravely try again.
11991192
*/
1200-
*io_context=IOContextForStrategy(strategy);
12011193
*foundPtr= false;
12021194
}
12031195
}
@@ -1211,8 +1203,6 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
12111203
*/
12121204
LWLockRelease(newPartitionLock);
12131205

1214-
*io_context=IOContextForStrategy(strategy);
1215-
12161206
/* Loop here in case we have to try another victim buffer */
12171207
for (;;)
12181208
{
@@ -1295,7 +1285,7 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
12951285
smgr->smgr_rlocator.locator.dbOid,
12961286
smgr->smgr_rlocator.locator.relNumber);
12971287

1298-
FlushBuffer(buf,NULL,IOOBJECT_RELATION,*io_context);
1288+
FlushBuffer(buf,NULL,IOOBJECT_RELATION,io_context);
12991289
LWLockRelease(BufferDescriptorGetContentLock(buf));
13001290

13011291
ScheduleBufferTagForWriteback(&BackendWritebackContext,
@@ -1494,7 +1484,7 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
14941484
* we may have been forced to release the buffer due to concurrent
14951485
* pinners or erroring out.
14961486
*/
1497-
pgstat_count_io_op(IOOBJECT_RELATION,*io_context,
1487+
pgstat_count_io_op(IOOBJECT_RELATION,io_context,
14981488
from_ring ?IOOP_REUSE :IOOP_EVICT);
14991489
}
15001490

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ PrefetchLocalBuffer(SMgrRelation smgr, ForkNumber forkNum,
108108
*/
109109
BufferDesc*
110110
LocalBufferAlloc(SMgrRelationsmgr,ForkNumberforkNum,BlockNumberblockNum,
111-
bool*foundPtr,IOContext*io_context)
111+
bool*foundPtr)
112112
{
113113
BufferTagnewTag;/* identity of requested block */
114114
LocalBufferLookupEnt*hresult;
@@ -128,14 +128,6 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum,
128128
hresult= (LocalBufferLookupEnt*)
129129
hash_search(LocalBufHash,&newTag,HASH_FIND,NULL);
130130

131-
/*
132-
* IO Operations on local buffers are only done in IOCONTEXT_NORMAL. Set
133-
* io_context here (instead of after a buffer hit would have returned) for
134-
* convenience since we don't have to worry about the overhead of calling
135-
* IOContextForStrategy().
136-
*/
137-
*io_context=IOCONTEXT_NORMAL;
138-
139131
if (hresult)
140132
{
141133
b=hresult->id;
@@ -239,6 +231,7 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum,
239231
buf_state &= ~BM_DIRTY;
240232
pg_atomic_unlocked_write_u32(&bufHdr->state,buf_state);
241233

234+
/* Temporary table I/O does not use Buffer Access Strategies */
242235
pgstat_count_io_op(IOOBJECT_TEMP_RELATION,IOCONTEXT_NORMAL,IOOP_WRITE);
243236
pgBufferUsage.local_blks_written++;
244237
}

‎src/backend/utils/activity/pgstat_io.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ pgstat_tracks_io_op(BackendType bktype, IOObject io_object,
344344
* Some BackendTypes will not do certain IOOps.
345345
*/
346346
if ((bktype==B_BG_WRITER||bktype==B_CHECKPOINTER)&&
347-
(io_op==IOOP_READ||io_op==IOOP_EVICT))
347+
(io_op==IOOP_READ||io_op==IOOP_EVICT||io_op==IOOP_HIT))
348348
return false;
349349

350350
if ((bktype==B_AUTOVAC_LAUNCHER||bktype==B_BG_WRITER||

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,6 +1259,7 @@ typedef enum io_stat_col
12591259
IO_COL_WRITES,
12601260
IO_COL_EXTENDS,
12611261
IO_COL_CONVERSION,
1262+
IO_COL_HITS,
12621263
IO_COL_EVICTIONS,
12631264
IO_COL_REUSES,
12641265
IO_COL_FSYNCS,
@@ -1277,16 +1278,18 @@ pgstat_get_io_op_index(IOOp io_op)
12771278
{
12781279
caseIOOP_EVICT:
12791280
returnIO_COL_EVICTIONS;
1281+
caseIOOP_EXTEND:
1282+
returnIO_COL_EXTENDS;
1283+
caseIOOP_FSYNC:
1284+
returnIO_COL_FSYNCS;
1285+
caseIOOP_HIT:
1286+
returnIO_COL_HITS;
12801287
caseIOOP_READ:
12811288
returnIO_COL_READS;
12821289
caseIOOP_REUSE:
12831290
returnIO_COL_REUSES;
12841291
caseIOOP_WRITE:
12851292
returnIO_COL_WRITES;
1286-
caseIOOP_EXTEND:
1287-
returnIO_COL_EXTENDS;
1288-
caseIOOP_FSYNC:
1289-
returnIO_COL_FSYNCS;
12901293
}
12911294

12921295
elog(ERROR,"unrecognized IOOp value: %d",io_op);

‎src/include/catalog/pg_proc.dat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5749,9 +5749,9 @@
57495749
proname => 'pg_stat_get_io', provolatile => 'v',
57505750
prorows => '30', proretset => 't',
57515751
proparallel => 'r', prorettype => 'record', proargtypes => '',
5752-
proallargtypes => '{text,text,text,int8,int8,int8,int8,int8,int8,int8,timestamptz}',
5753-
proargmodes => '{o,o,o,o,o,o,o,o,o,o,o}',
5754-
proargnames => '{backend_type,io_object,io_context,reads,writes,extends,op_bytes,evictions,reuses,fsyncs,stats_reset}',
5752+
proallargtypes => '{text,text,text,int8,int8,int8,int8,int8,int8,int8,int8,timestamptz}',
5753+
proargmodes => '{o,o,o,o,o,o,o,o,o,o,o,o}',
5754+
proargnames => '{backend_type,io_object,io_context,reads,writes,extends,op_bytes,hits,evictions,reuses,fsyncs,stats_reset}',
57555755
prosrc => 'pg_stat_get_io' },
57565756

57575757
{ oid => '1136', descr => 'statistics: information about WAL activity',

‎src/include/pgstat.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ typedef enum IOOp
296296
IOOP_EVICT,
297297
IOOP_EXTEND,
298298
IOOP_FSYNC,
299+
IOOP_HIT,
299300
IOOP_READ,
300301
IOOP_REUSE,
301302
IOOP_WRITE,

‎src/include/storage/buf_internals.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ extern PrefetchBufferResult PrefetchLocalBuffer(SMgrRelation smgr,
419419
ForkNumberforkNum,
420420
BlockNumberblockNum);
421421
externBufferDesc*LocalBufferAlloc(SMgrRelationsmgr,ForkNumberforkNum,
422-
BlockNumberblockNum,bool*foundPtr,IOContext*io_context);
422+
BlockNumberblockNum,bool*foundPtr);
423423
externvoidMarkLocalBufferDirty(Bufferbuffer);
424424
externvoidDropRelationLocalBuffers(RelFileLocatorrlocator,
425425
ForkNumberforkNum,

‎src/test/regress/expected/rules.out‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1884,11 +1884,12 @@ pg_stat_io| SELECT backend_type,
18841884
writes,
18851885
extends,
18861886
op_bytes,
1887+
hits,
18871888
evictions,
18881889
reuses,
18891890
fsyncs,
18901891
stats_reset
1891-
FROM pg_stat_get_io() b(backend_type, io_object, io_context, reads, writes, extends, op_bytes, evictions, reuses, fsyncs, stats_reset);
1892+
FROM pg_stat_get_io() b(backend_type, io_object, io_context, reads, writes, extends, op_bytes,hits,evictions, reuses, fsyncs, stats_reset);
18921893
pg_stat_progress_analyze| SELECT s.pid,
18931894
s.datid,
18941895
d.datname,

0 commit comments

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