From 3432ae5d2421ab49bce015c6a64bb256ae36625d Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 20 Mar 2025 11:32:10 -0400 Subject: [PATCH v2.11 01/27] aio, bufmgr: Comment fixes Some of these comments have been wrong for a while (12f3867f5534), some I recently introduced (da7226993fd, 55b454d0e14). This also updates a comment in FlushBuffer(), which will be copied in a future commit. These changes seem big enough to be worth doing in separate commits. Suggested-by: Noah Misch Discussion: https://postgr.es/m/20250319212530.80.nmisch@google.com --- src/include/storage/aio.h | 2 +- src/backend/postmaster/postmaster.c | 2 +- src/backend/storage/buffer/bufmgr.c | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/include/storage/aio.h b/src/include/storage/aio.h index 7b6b7d20a85..a221c6c3d9a 100644 --- a/src/include/storage/aio.h +++ b/src/include/storage/aio.h @@ -72,7 +72,7 @@ typedef enum PgAioHandleFlags /* * The IO operations supported by the AIO subsystem. * - * This could be in aio_internal.h, as it is not pubicly referenced, but + * This could be in aio_internal.h, as it is not publicly referenced, but * PgAioOpData currently *does* need to be public, therefore keeping this * public seems to make sense. */ diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index a0c37532d2f..c966c2e83af 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -4401,7 +4401,7 @@ maybe_adjust_io_workers(void) ++io_worker_count; } else - break; /* XXX try again soon? */ + break; /* try again next time */ } /* Too many running? */ diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 14fc1bd1248..37fb09d8b92 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -3864,9 +3864,10 @@ FlushBuffer(BufferDesc *buf, SMgrRelation reln, IOObject io_object, XLogFlush(recptr); /* - * Now it's safe to write buffer to disk. Note that no one else should - * have been able to write it while we were busy with log flushing because - * only one process at a time can set the BM_IO_IN_PROGRESS bit. + * Now it's safe to write the buffer to disk. Note that no one else should + * have been able to write it, while we were busy with log flushing, + * because we got the exclusive right to perform I/O by setting the + * BM_IO_IN_PROGRESS bit. */ bufBlock = BufHdrGetBlock(buf); @@ -5434,9 +5435,6 @@ IsBufferCleanupOK(Buffer buffer) /* * Functions for buffer I/O handling * - * Note: We assume that nested buffer I/O never occurs. - * i.e at most one BM_IO_IN_PROGRESS bit is set per proc. - * * Also note that these are used only for shared buffers, not local ones. */ -- 2.48.1.76.g4e746b1a31.dirty