From 3e1ef58a06fe6d1521e47535c335c5f5622f6ab9 Mon Sep 17 00:00:00 2001 From: John Morris Date: Wed, 28 Jun 2023 20:27:17 -0700 Subject: [PATCH 1/6] pg_stat_statement5 passes, including initializing postmaster --- .../pg_stat_statements/pg_stat_statements.c | 139 +++++++++--------- src/backend/postmaster/postmaster.c | 63 ++++---- 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 8dcb2ddd64..be7f023aef 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -500,8 +500,8 @@ pgss_shmem_startup(void) { bool found; HASHCTL info; - FILE *file = NULL; - FILE *qfile = NULL; + File file = -1; + File qfile = -1; uint32 header; int32 num; int32 pgver; @@ -570,8 +570,8 @@ pgss_shmem_startup(void) unlink(PGSS_TEXT_FILE); /* Allocate new query text temp file */ - qfile = AllocateFile(PGSS_TEXT_FILE, PG_BINARY_W); - if (qfile == NULL) + qfile = PathNameOpenFile(PGSS_TEXT_FILE, O_WRONLY | O_CREAT | O_TRUNC | PG_BINARY); + if (qfile < 0) goto write_error; /* @@ -581,29 +581,29 @@ pgss_shmem_startup(void) */ if (!pgss_save) { - FreeFile(qfile); + FileClose(qfile); return; } /* * Attempt to load old statistics from the dump file. */ - file = AllocateFile(PGSS_DUMP_FILE, PG_BINARY_R); - if (file == NULL) + file = PathNameOpenFile(PGSS_DUMP_FILE, O_RDONLY|PG_BINARY); + if (file < 0) { if (errno != ENOENT) goto read_error; /* No existing persisted stats file, so we're done */ - FreeFile(qfile); + FileClose(qfile); return; } buffer_size = 2048; buffer = (char *) palloc(buffer_size); - if (fread(&header, sizeof(uint32), 1, file) != 1 || - fread(&pgver, sizeof(uint32), 1, file) != 1 || - fread(&num, sizeof(int32), 1, file) != 1) + if (FileReadSeq(file, &header, sizeof(uint32), 0) != sizeof(uint32) || + FileReadSeq(file, &pgver, sizeof(uint32), 0) != sizeof(uint32) || + FileReadSeq(file, &num, sizeof(int32), 0) != sizeof(uint32)) goto read_error; if (header != PGSS_FILE_HEADER || @@ -616,7 +616,7 @@ pgss_shmem_startup(void) pgssEntry *entry; Size query_offset; - if (fread(&temp, sizeof(pgssEntry), 1, file) != 1) + if (FileReadSeq(file, &temp, sizeof(pgssEntry), 0 != sizeof(pgssEntry))) goto read_error; /* Encoding is the only field we can easily sanity-check */ @@ -630,7 +630,7 @@ pgss_shmem_startup(void) buffer = repalloc(buffer, buffer_size); } - if (fread(buffer, 1, temp.query_len + 1, file) != temp.query_len + 1) + if (FileReadSeq(file, buffer, temp.query_len + 1, 0) != temp.query_len + 1) goto read_error; /* Should have a trailing null, but let's make sure */ @@ -642,7 +642,7 @@ pgss_shmem_startup(void) /* Store the query text */ query_offset = pgss->extent; - if (fwrite(buffer, 1, temp.query_len + 1, qfile) != temp.query_len + 1) + if (FileWriteSeq(qfile, buffer, temp.query_len + 1, 0) != temp.query_len + 1) goto write_error; pgss->extent += temp.query_len + 1; @@ -656,12 +656,12 @@ pgss_shmem_startup(void) } /* Read global statistics for pg_stat_statements */ - if (fread(&pgss->stats, sizeof(pgssGlobalStats), 1, file) != 1) + if (FileReadSeq(file, &pgss->stats, sizeof(pgssGlobalStats), 0) != 1) goto read_error; pfree(buffer); - FreeFile(file); - FreeFile(qfile); + FileClose(file); + FileClose(qfile); /* * Remove the persisted stats file so it's not included in @@ -700,10 +700,10 @@ write_error: fail: if (buffer) pfree(buffer); - if (file) - FreeFile(file); - if (qfile) - FreeFile(qfile); + if (file >= 0) + FileClose(file); + if (qfile >= 0) + FileClose(qfile); /* If possible, throw away the bogus file; ignore any error */ unlink(PGSS_DUMP_FILE); @@ -722,7 +722,7 @@ fail: static void pgss_shmem_shutdown(int code, Datum arg) { - FILE *file; + File file; char *qbuffer = NULL; Size qbuffer_size = 0; HASH_SEQ_STATUS hash_seq; @@ -741,16 +741,16 @@ pgss_shmem_shutdown(int code, Datum arg) if (!pgss_save) return; - file = AllocateFile(PGSS_DUMP_FILE ".tmp", PG_BINARY_W); - if (file == NULL) + file = PathNameOpenFile(PGSS_DUMP_FILE ".tmp", O_WRONLY | O_CREAT | O_TRUNC | PG_BINARY); + if (file < 0) goto error; - if (fwrite(&PGSS_FILE_HEADER, sizeof(uint32), 1, file) != 1) + if (FileWriteSeq(file, &PGSS_FILE_HEADER, sizeof(uint32), 0) != sizeof(uint32)) goto error; - if (fwrite(&PGSS_PG_MAJOR_VERSION, sizeof(uint32), 1, file) != 1) + if (FileWriteSeq(file, &PGSS_PG_MAJOR_VERSION, sizeof(uint32), 0) != sizeof(uint32)) goto error; num_entries = hash_get_num_entries(pgss_hash); - if (fwrite(&num_entries, sizeof(int32), 1, file) != 1) + if (FileWriteSeq(file, &num_entries, sizeof(int32), 0) != 1) goto error; qbuffer = qtext_load_file(&qbuffer_size); @@ -771,8 +771,8 @@ pgss_shmem_shutdown(int code, Datum arg) if (qstr == NULL) continue; /* Ignore any entries with bogus texts */ - if (fwrite(entry, sizeof(pgssEntry), 1, file) != 1 || - fwrite(qstr, 1, len + 1, file) != len + 1) + if (FileWriteSeq(file, entry, sizeof(pgssEntry), 0) != sizeof(pgssEntry) || + FileWriteSeq(file, &qstr, len + 1, 0) != len + 1) { /* note: we assume hash_seq_term won't change errno */ hash_seq_term(&hash_seq); @@ -781,15 +781,15 @@ pgss_shmem_shutdown(int code, Datum arg) } /* Dump global statistics for pg_stat_statements */ - if (fwrite(&pgss->stats, sizeof(pgssGlobalStats), 1, file) != 1) + if (FileWriteSeq(file, &pgss->stats, sizeof(pgssGlobalStats), 0) != sizeof(pgssGlobalStats)) goto error; free(qbuffer); qbuffer = NULL; - if (FreeFile(file)) + if (FileClose(file) < 0) { - file = NULL; + file = -1; goto error; } @@ -809,8 +809,8 @@ error: errmsg("could not write file \"%s\": %m", PGSS_DUMP_FILE ".tmp"))); free(qbuffer); - if (file) - FreeFile(file); + if (file >= 0) + FileClose(file); unlink(PGSS_DUMP_FILE ".tmp"); unlink(PGSS_TEXT_FILE); } @@ -2081,7 +2081,7 @@ qtext_store(const char *query, int query_len, Size *query_offset, int *gc_count) { Size off; - int fd; + File fd; /* * We use a spinlock to protect extent/n_writers/gc_count, so that @@ -2114,16 +2114,16 @@ qtext_store(const char *query, int query_len, } /* Now write the data into the successfully-reserved part of the file */ - fd = OpenTransientFile(PGSS_TEXT_FILE, O_RDWR | O_CREAT | PG_BINARY); + fd = PathNameOpenFile(PGSS_TEXT_FILE, O_RDWR | O_CREAT | PG_BINARY); if (fd < 0) goto error; - if (pg_pwrite(fd, query, query_len, off) != query_len) + if (FileWrite(fd, query, query_len, off, 0) != query_len) goto error; - if (pg_pwrite(fd, "\0", 1, off + query_len) != 1) + if (FileWrite(fd, "\0", 1, off + query_len, 0) != 1) goto error; - CloseTransientFile(fd); + FileClose(fd); /* Mark our write complete */ { @@ -2172,11 +2172,11 @@ static char * qtext_load_file(Size *buffer_size) { char *buf; - int fd; - struct stat stat; + File fd; Size nread; + off_t length; - fd = OpenTransientFile(PGSS_TEXT_FILE, O_RDONLY | PG_BINARY); + fd = PathNameOpenFile(PGSS_TEXT_FILE, O_RDONLY | PG_BINARY); if (fd < 0) { if (errno != ENOENT) @@ -2188,19 +2188,20 @@ qtext_load_file(Size *buffer_size) } /* Get file length */ - if (fstat(fd, &stat)) + length = FileSize(fd); + if (length < 0) { ereport(LOG, (errcode_for_file_access(), errmsg("could not stat file \"%s\": %m", PGSS_TEXT_FILE))); - CloseTransientFile(fd); + FileClose(fd); return NULL; } /* Allocate buffer; beware that off_t might be wider than size_t */ - if (stat.st_size <= MaxAllocHugeSize) - buf = (char *) malloc(stat.st_size); + if (length <= MaxAllocHugeSize) + buf = (char *) malloc(length); else buf = NULL; if (buf == NULL) @@ -2210,7 +2211,7 @@ qtext_load_file(Size *buffer_size) errmsg("out of memory"), errdetail("Could not allocate enough memory to read file \"%s\".", PGSS_TEXT_FILE))); - CloseTransientFile(fd); + FileClose(fd); return NULL; } @@ -2220,9 +2221,9 @@ qtext_load_file(Size *buffer_size) * so read a very large file in 1GB segments. */ nread = 0; - while (nread < stat.st_size) + while (nread < length) { - int toread = Min(1024 * 1024 * 1024, stat.st_size - nread); + int toread = Min(1024 * 1024 * 1024, length - nread); /* * If we get a short read and errno doesn't get set, the reason is @@ -2232,7 +2233,7 @@ qtext_load_file(Size *buffer_size) * writes from garbage collection. */ errno = 0; - if (read(fd, buf + nread, toread) != toread) + if (FileReadSeq(fd, buf + nread, toread, 0) != toread) { if (errno) ereport(LOG, @@ -2240,13 +2241,13 @@ qtext_load_file(Size *buffer_size) errmsg("could not read file \"%s\": %m", PGSS_TEXT_FILE))); free(buf); - CloseTransientFile(fd); + FileClose(fd); return NULL; } nread += toread; } - if (CloseTransientFile(fd) != 0) + if (FileClose(fd) != 0) ereport(LOG, (errcode_for_file_access(), errmsg("could not close file \"%s\": %m", PGSS_TEXT_FILE))); @@ -2342,7 +2343,7 @@ gc_qtexts(void) { char *qbuffer; Size qbuffer_size; - FILE *qfile = NULL; + File qfile = -1; HASH_SEQ_STATUS hash_seq; pgssEntry *entry; Size extent; @@ -2373,8 +2374,8 @@ gc_qtexts(void) * larger, this should always work on traditional filesystems; though we * could still lose on copy-on-write filesystems. */ - qfile = AllocateFile(PGSS_TEXT_FILE, PG_BINARY_W); - if (qfile == NULL) + qfile = PathNameOpenFile(PGSS_TEXT_FILE, O_WRONLY | O_CREAT | O_TRUNC | PG_BINARY); + if (qfile < 0) { ereport(LOG, (errcode_for_file_access(), @@ -2404,7 +2405,7 @@ gc_qtexts(void) continue; } - if (fwrite(qry, 1, query_len + 1, qfile) != query_len + 1) + if (FileWriteSeq(qfile, qry, query_len + 1, 0) != query_len + 1) { ereport(LOG, (errcode_for_file_access(), @@ -2423,19 +2424,19 @@ gc_qtexts(void) * Truncate away any now-unused space. If this fails for some odd reason, * we log it, but there's no need to fail. */ - if (ftruncate(fileno(qfile), extent) != 0) + if (FileTruncate(qfile, extent, 0) != 0) ereport(LOG, (errcode_for_file_access(), errmsg("could not truncate file \"%s\": %m", PGSS_TEXT_FILE))); - if (FreeFile(qfile)) + if (FileClose(qfile) != 0) { ereport(LOG, (errcode_for_file_access(), errmsg("could not write file \"%s\": %m", PGSS_TEXT_FILE))); - qfile = NULL; + qfile = -1; goto gc_fail; } @@ -2469,8 +2470,8 @@ gc_qtexts(void) gc_fail: /* clean up resources */ - if (qfile) - FreeFile(qfile); + if (qfile < 0) + FileClose(qfile); free(qbuffer); /* @@ -2488,14 +2489,14 @@ gc_fail: * Destroy the query text file and create a new, empty one */ (void) unlink(PGSS_TEXT_FILE); - qfile = AllocateFile(PGSS_TEXT_FILE, PG_BINARY_W); - if (qfile == NULL) + qfile = PathNameOpenFile(PGSS_TEXT_FILE, O_WRONLY | O_CREAT | O_TRUNC | PG_BINARY); + if (qfile < 0) ereport(LOG, (errcode_for_file_access(), errmsg("could not recreate file \"%s\": %m", PGSS_TEXT_FILE))); else - FreeFile(qfile); + FileClose(qfile); /* Reset the shared extent pointer */ pgss->extent = 0; @@ -2525,7 +2526,7 @@ entry_reset(Oid userid, Oid dbid, uint64 queryid) { HASH_SEQ_STATUS hash_seq; pgssEntry *entry; - FILE *qfile; + File qfile; long num_entries; long num_remove = 0; pgssHashKey key; @@ -2608,8 +2609,8 @@ entry_reset(Oid userid, Oid dbid, uint64 queryid) * Write new empty query file, perhaps even creating a new one to recover * if the file was missing. */ - qfile = AllocateFile(PGSS_TEXT_FILE, PG_BINARY_W); - if (qfile == NULL) + qfile = PathNameOpenFile(PGSS_TEXT_FILE, O_WRONLY | O_CREAT | O_TRUNC | PG_BINARY); + if (qfile < 0) { ereport(LOG, (errcode_for_file_access(), @@ -2619,13 +2620,13 @@ entry_reset(Oid userid, Oid dbid, uint64 queryid) } /* If ftruncate fails, log it, but it's not a fatal problem */ - if (ftruncate(fileno(qfile), 0) != 0) + if (FileTruncate(qfile, 0, 0) != 0) ereport(LOG, (errcode_for_file_access(), errmsg("could not truncate file \"%s\": %m", PGSS_TEXT_FILE))); - FreeFile(qfile); + FileClose(qfile); done: pgss->extent = 0; diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 4c49393fc5..56dc016d3c 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -859,6 +859,9 @@ PostmasterMain(int argc, char *argv[]) ExitPostmaster(1); } + /* Enable I/O to virtual files */ + InitFileAccess(); + /* * Locate the proper configuration files and data directory, and read * postgresql.conf for the first time. @@ -1361,12 +1364,12 @@ PostmasterMain(int argc, char *argv[]) */ if (external_pid_file) { - FILE *fpidfile = fopen(external_pid_file, "w"); + File fpidfile = PathNameOpenFile(external_pid_file, O_WRONLY|O_CREAT|O_TRUNC); - if (fpidfile) + if (fpidfile >= 0) { - fprintf(fpidfile, "%d\n", MyProcPid); - fclose(fpidfile); + FilePrintf(fpidfile, "%d\n", MyProcPid); + FileClose(fpidfile); /* Make PID file world readable */ if (chmod(external_pid_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) != 0) @@ -1580,12 +1583,12 @@ static void checkControlFile(void) { char path[MAXPGPATH]; - FILE *fp; + File file; snprintf(path, sizeof(path), "%s/global/pg_control", DataDir); - fp = AllocateFile(path, PG_BINARY_R); - if (fp == NULL) + file = PathNameOpenFile(path, O_RDONLY | PG_BINARY); + if (file < 0) { write_stderr("%s: could not find the database system\n" "Expected to find it in the directory \"%s\",\n" @@ -1593,7 +1596,7 @@ checkControlFile(void) progname, DataDir, path, strerror(errno)); ExitPostmaster(2); } - FreeFile(fp); + FileClose(file); } /* @@ -4526,7 +4529,7 @@ internal_forkexec(int argc, char *argv[], Port *port) pid_t pid; char tmpfilename[MAXPGPATH]; BackendParameters param; - FILE *fp; + File file; if (!save_backend_variables(¶m, port)) return -1; /* log made by save_backend_variables */ @@ -4537,8 +4540,8 @@ internal_forkexec(int argc, char *argv[], Port *port) MyProcPid, ++tmpBackendFileNum); /* Open file */ - fp = AllocateFile(tmpfilename, PG_BINARY_W); - if (!fp) + file = PathNameOpenFile(tmpfilename, O_WRONLY|O_CREAT|O_TRUNC|PG_BINARY); + if (file < 0) { /* * As in OpenTemporaryFileInTablespace, try to make the temp-file @@ -4546,8 +4549,8 @@ internal_forkexec(int argc, char *argv[], Port *port) */ (void) MakePGDirectory(PG_TEMP_FILES_DIR); - fp = AllocateFile(tmpfilename, PG_BINARY_W); - if (!fp) + file = PathNameOpenFile(tmpfilename, O_WRONLY|O_CREAT|O_TRUNC|PG_BINARY); + if (file < 0) { ereport(LOG, (errcode_for_file_access(), @@ -4557,17 +4560,17 @@ internal_forkexec(int argc, char *argv[], Port *port) } } - if (fwrite(¶m, sizeof(param), 1, fp) != 1) + if (FileWriteSeq(file, ¶m, sizeof(param), 0) != 1) { ereport(LOG, (errcode_for_file_access(), errmsg("could not write to file \"%s\": %m", tmpfilename))); - FreeFile(fp); + FileClose(file); return -1; } /* Release file */ - if (FreeFile(fp)) + if (FileClose(file)) { ereport(LOG, (errcode_for_file_access(), @@ -5545,12 +5548,13 @@ MaybeStartWalReceiver(void) static bool CreateOptsFile(int argc, char *argv[], char *fullprogname) { - FILE *fp; + File file; int i; #define OPTS_FILE "postmaster.opts" - if ((fp = fopen(OPTS_FILE, "w")) == NULL) + file = PathNameOpenFile(OPTS_FILE, O_WRONLY | O_CREAT | O_TRUNC); + if (file < 0) { ereport(LOG, (errcode_for_file_access(), @@ -5558,18 +5562,13 @@ CreateOptsFile(int argc, char *argv[], char *fullprogname) return false; } - fprintf(fp, "%s", fullprogname); + FilePrintf(file, "%s", fullprogname); for (i = 1; i < argc; i++) - fprintf(fp, " \"%s\"", argv[i]); - fputs("\n", fp); + FilePrintf(file, " \"%s\"", argv[i]); + FilePuts(file, "\n"); - if (fclose(fp)) - { - ereport(LOG, - (errcode_for_file_access(), - errmsg("could not write file \"%s\": %m", OPTS_FILE))); + if (FileClose(file)) return false; - } return true; } @@ -6226,18 +6225,18 @@ read_backend_variables(char *id, Port *port) #ifndef WIN32 /* Non-win32 implementation reads from file */ - FILE *fp; + File file; /* Open file */ - fp = AllocateFile(id, PG_BINARY_R); - if (!fp) + file = PathNameOpenFile(id, O_RDONLY|PG_BINARY); + if (file < 0) { write_stderr("could not open backend variables file \"%s\": %s\n", id, strerror(errno)); exit(1); } - if (fread(¶m, sizeof(param), 1, fp) != 1) + if (FileReadSeq(file, ¶m, sizeof(param), 0 != 1) { write_stderr("could not read from backend variables file \"%s\": %s\n", id, strerror(errno)); @@ -6245,7 +6244,7 @@ read_backend_variables(char *id, Port *port) } /* Release file */ - FreeFile(fp); + FileClose(file); if (unlink(id) != 0) { write_stderr("could not remove file \"%s\": %s\n", -- 2.33.0 From ed9572251aba5739fae3c7c7799f9cb7e8779d52 Mon Sep 17 00:00:00 2001 From: John Morris Date: Wed, 28 Jun 2023 21:01:02 -0700 Subject: [PATCH 2/6] Rewrite heap, with new sync routine --- src/backend/access/heap/rewriteheap.c | 57 ++++++--------------------- src/backend/storage/file/fd.c | 22 +++++++++++ src/include/storage/fd.h | 1 + 3 files changed, 36 insertions(+), 44 deletions(-) diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index 424958912c..1d8f317d48 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -1107,7 +1107,7 @@ void heap_xlog_logical_rewrite(XLogReaderState *r) { char path[MAXPGPATH]; - int fd; + File file; xl_heap_rewrite_mapping *xlrec; uint32 len; char *data; @@ -1120,9 +1120,9 @@ heap_xlog_logical_rewrite(XLogReaderState *r) LSN_FORMAT_ARGS(xlrec->start_lsn), xlrec->mapped_xid, XLogRecGetXid(r)); - fd = OpenTransientFile(path, + file = PathNameOpenTemporaryFile(path, O_CREAT | O_WRONLY | PG_BINARY); - if (fd < 0) + if (file < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not create file \"%s\": %m", path))); @@ -1131,48 +1131,33 @@ heap_xlog_logical_rewrite(XLogReaderState *r) * Truncate all data that's not guaranteed to have been safely fsynced (by * previous record or by the last checkpoint). */ - pgstat_report_wait_start(WAIT_EVENT_LOGICAL_REWRITE_TRUNCATE); - if (ftruncate(fd, xlrec->offset) != 0) + if (FileTruncate(file, xlrec->offset, WAIT_EVENT_LOGICAL_REWRITE_TRUNCATE) != 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not truncate file \"%s\" to %u: %m", path, (uint32) xlrec->offset))); - pgstat_report_wait_end(); data = XLogRecGetData(r) + sizeof(*xlrec); len = xlrec->num_mappings * sizeof(LogicalRewriteMappingData); /* write out tail end of mapping file (again) */ - errno = 0; - pgstat_report_wait_start(WAIT_EVENT_LOGICAL_REWRITE_MAPPING_WRITE); - if (pg_pwrite(fd, data, len, xlrec->offset) != len) - { - /* if write didn't set errno, assume problem is no disk space */ - if (errno == 0) - errno = ENOSPC; + if (FileWrite(file, data, len, xlrec->offset, WAIT_EVENT_LOGICAL_REWRITE_MAPPING_WRITE) != len) ereport(ERROR, (errcode_for_file_access(), errmsg("could not write to file \"%s\": %m", path))); - } - pgstat_report_wait_end(); /* * Now fsync all previously written data. We could improve things and only * do this for the last write to a file, but the required bookkeeping * doesn't seem worth the trouble. */ - pgstat_report_wait_start(WAIT_EVENT_LOGICAL_REWRITE_MAPPING_SYNC); - if (pg_fsync(fd) != 0) + if (FileSync(file, WAIT_EVENT_LOGICAL_REWRITE_MAPPING_SYNC) != 0) ereport(data_sync_elevel(ERROR), (errcode_for_file_access(), errmsg("could not fsync file \"%s\": %m", path))); - pgstat_report_wait_end(); - if (CloseTransientFile(fd) != 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", path))); + FileClose(file); } /* --- @@ -1249,39 +1234,23 @@ CheckPointLogicalRewriteHeap(void) } else { - /* on some operating systems fsyncing a file requires O_RDWR */ - int fd = OpenTransientFile(path, O_RDWR | PG_BINARY); - /* * The file cannot vanish due to concurrency since this function * is the only one removing logical mappings and only one * checkpoint can be in progress at a time. - */ - if (fd < 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not open file \"%s\": %m", path))); - - /* - * We could try to avoid fsyncing files that either haven't + * We could try to avoid syncing files that either haven't * changed or have only been created since the checkpoint's start, * but it's currently not deemed worth the effort. */ - pgstat_report_wait_start(WAIT_EVENT_LOGICAL_REWRITE_CHECKPOINT_SYNC); - if (pg_fsync(fd) != 0) + if (PathNameFileSync(path, WAIT_EVENT_LOGICAL_REWRITE_CHECKPOINT_SYNC) < 0) ereport(data_sync_elevel(ERROR), (errcode_for_file_access(), - errmsg("could not fsync file \"%s\": %m", path))); - pgstat_report_wait_end(); - - if (CloseTransientFile(fd) != 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", path))); + errmsg("could not fsync file \"%s\": %m", path))); } } - FreeDir(mappings_dir); - /* persist directory entries to disk */ + + /* Delete the directory and persist the directory changes */ + FreeDir(mappings_dir); fsync_fname("pg_logical/mappings", true); } diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index cd7441eb37..488e279595 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -2416,6 +2416,28 @@ FileTruncate(File file, off_t offset, uint32 wait_event_info) return returnCode; } +int +PathNameFileSync(const char *pathName, uint32 wait_event_info) +{ + int ret, save_errno; + + /* Open the file, returning immediately if unable */ + File file = PathNameOpenFile(pathName, O_RDWR | PG_BINARY); + if (file < 0) + return file; + + /* Sync the now opened file, remembering if error occurred. */ + ret = FileSync(file, wait_event_info); + if (ret == -1) + setFileError(file, errno, "Error while syncing file: %s", pathName); + + /* Close the file. */ + FileClose(file); + + /* Done, remembering the sync error */ + return ret; +} + /* * Return the pathname associated with an open file. * diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 69b6ce7111..343b12f90e 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -118,6 +118,7 @@ extern ssize_t FileWrite(File file, const void *buffer, size_t amount, off_t off extern int FileSync(File file, uint32 wait_event_info); extern int FileZero(File file, off_t offset, off_t amount, uint32 wait_event_info); extern int FileFallocate(File file, off_t offset, off_t amount, uint32 wait_event_info); +extern int PathNameFileSync(const char *pathName, uint32 wait_event_info); extern off_t FileSize(File file); extern int FileTruncate(File file, off_t offset, uint32 wait_event_info); -- 2.33.0 From f5d8636e6be041c30cb10393282298d020280832 Mon Sep 17 00:00:00 2001 From: John Morris Date: Wed, 28 Jun 2023 21:01:27 -0700 Subject: [PATCH 3/6] Two phase uses new api --- src/backend/access/transam/twophase.c | 82 +++++++++------------------ 1 file changed, 26 insertions(+), 56 deletions(-) diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index 068e59bec0..b6db37c872 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -1282,25 +1282,20 @@ ReadTwoPhaseFile(TransactionId xid, bool missing_ok) char path[MAXPGPATH]; char *buf; TwoPhaseFileHeader *hdr; - int fd; - struct stat stat; + File file; uint32 crc_offset; pg_crc32c calc_crc, file_crc; int r; + off_t size; TwoPhaseFilePath(path, xid); - fd = OpenTransientFile(path, O_RDONLY | PG_BINARY); - if (fd < 0) - { - if (missing_ok && errno == ENOENT) - return NULL; - + file = PathNameOpenTemporaryFile(path, O_RDONLY | PG_BINARY); + if (file < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", path))); - } /* * Check file length. We can determine a lower bound pretty easily. We @@ -1308,37 +1303,35 @@ ReadTwoPhaseFile(TransactionId xid, bool missing_ok) * we can't guarantee that we won't get an out of memory error anyway, * even on a valid file. */ - if (fstat(fd, &stat)) + size = FileSize(file); + if (size < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not stat file \"%s\": %m", path))); - if (stat.st_size < (MAXALIGN(sizeof(TwoPhaseFileHeader)) + + if (size < (MAXALIGN(sizeof(TwoPhaseFileHeader)) + MAXALIGN(sizeof(TwoPhaseRecordOnDisk)) + sizeof(pg_crc32c)) || - stat.st_size > MaxAllocSize) + size > MaxAllocSize) ereport(ERROR, (errcode(ERRCODE_DATA_CORRUPTED), - errmsg_plural("incorrect size of file \"%s\": %lld byte", - "incorrect size of file \"%s\": %lld bytes", - (long long int) stat.st_size, path, - (long long int) stat.st_size))); + errmsg("incorrect size of file \"%s\": %lld byte", + path, (long long int) size))); - crc_offset = stat.st_size - sizeof(pg_crc32c); + crc_offset = size - sizeof(pg_crc32c); if (crc_offset != MAXALIGN(crc_offset)) ereport(ERROR, (errcode(ERRCODE_DATA_CORRUPTED), - errmsg("incorrect alignment of CRC offset for file \"%s\"", + errmsg("incorrect alignment of CRC offset for file \"%s\"", path))); /* * OK, slurp in the file. */ - buf = (char *) palloc(stat.st_size); + buf = (char *) palloc(size); - pgstat_report_wait_start(WAIT_EVENT_TWOPHASE_FILE_READ); - r = read(fd, buf, stat.st_size); - if (r != stat.st_size) + r = FileReadSeq(file, buf, size, WAIT_EVENT_TWOPHASE_FILE_READ); + if (r != size) { if (r < 0) ereport(ERROR, @@ -1347,15 +1340,10 @@ ReadTwoPhaseFile(TransactionId xid, bool missing_ok) else ereport(ERROR, (errmsg("could not read file \"%s\": read %d of %lld", - path, r, (long long int) stat.st_size))); + path, r, (long long int) size))); } - pgstat_report_wait_end(); - - if (CloseTransientFile(fd) != 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", path))); + FileClose(file); hdr = (TwoPhaseFileHeader *) buf; if (hdr->magic != TWOPHASE_MAGIC) @@ -1364,7 +1352,7 @@ ReadTwoPhaseFile(TransactionId xid, bool missing_ok) errmsg("invalid magic number stored in file \"%s\"", path))); - if (hdr->total_len != stat.st_size) + if (hdr->total_len != size) ereport(ERROR, (errcode(ERRCODE_DATA_CORRUPTED), errmsg("invalid size stored in file \"%s\"", @@ -1714,7 +1702,7 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len) { char path[MAXPGPATH]; pg_crc32c statefile_crc; - int fd; + File file; /* Recompute CRC */ INIT_CRC32C(statefile_crc); @@ -1723,51 +1711,33 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len) TwoPhaseFilePath(path, xid); - fd = OpenTransientFile(path, - O_CREAT | O_TRUNC | O_WRONLY | PG_BINARY); - if (fd < 0) + file = PathNameOpenTemporaryFile(path, O_CREAT | O_TRUNC | O_WRONLY | PG_BINARY); + if (file < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not recreate file \"%s\": %m", path))); /* Write content and CRC */ - errno = 0; - pgstat_report_wait_start(WAIT_EVENT_TWOPHASE_FILE_WRITE); - if (write(fd, content, len) != len) - { - /* if write didn't set errno, assume problem is no disk space */ - if (errno == 0) - errno = ENOSPC; + if (FileWriteSeq(file, content, len, WAIT_EVENT_TWOPHASE_FILE_WRITE) != len) ereport(ERROR, (errcode_for_file_access(), errmsg("could not write file \"%s\": %m", path))); - } - if (write(fd, &statefile_crc, sizeof(pg_crc32c)) != sizeof(pg_crc32c)) - { - /* if write didn't set errno, assume problem is no disk space */ - if (errno == 0) - errno = ENOSPC; + + if (FileWriteSeq(file, &statefile_crc, sizeof(pg_crc32c), WAIT_EVENT_TWOPHASE_FILE_WRITE) != sizeof(pg_crc32c)) ereport(ERROR, (errcode_for_file_access(), errmsg("could not write file \"%s\": %m", path))); - } - pgstat_report_wait_end(); /* * We must fsync the file because the end-of-replay checkpoint will not do * so, there being no GXACT in shared memory yet to tell it to. */ - pgstat_report_wait_start(WAIT_EVENT_TWOPHASE_FILE_SYNC); - if (pg_fsync(fd) != 0) + if (FileSync(file, WAIT_EVENT_TWOPHASE_FILE_SYNC) != 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not fsync file \"%s\": %m", path))); - pgstat_report_wait_end(); - if (CloseTransientFile(fd) != 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", path))); + FileClose(file); } /* -- 2.33.0 From 83492a36c892fc2b6071a73b467a13ea03de3500 Mon Sep 17 00:00:00 2001 From: John Morris Date: Wed, 28 Jun 2023 21:05:32 -0700 Subject: [PATCH 4/6] commands and extension use new api --- src/backend/commands/dbcommands.c | 22 +++++++--------------- src/backend/commands/extension.c | 28 ++++++++++++---------------- 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 09f1ab41ad..8b65bc69e1 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -456,7 +456,7 @@ ScanSourceDatabasePgClassTuple(HeapTupleData *tuple, Oid tbid, Oid dbid, static void CreateDirAndVersionFile(char *dbpath, Oid dbid, Oid tsid, bool isRedo) { - int fd; + File file; int nbytes; char versionfile[MAXPGPATH]; char buf[16]; @@ -508,31 +508,23 @@ CreateDirAndVersionFile(char *dbpath, Oid dbid, Oid tsid, bool isRedo) */ snprintf(versionfile, sizeof(versionfile), "%s/%s", dbpath, "PG_VERSION"); - fd = OpenTransientFile(versionfile, O_WRONLY | O_CREAT | O_EXCL | PG_BINARY); - if (fd < 0 && errno == EEXIST && isRedo) - fd = OpenTransientFile(versionfile, O_WRONLY | O_TRUNC | PG_BINARY); + file = PathNameOpenTemporaryFile(versionfile, O_WRONLY | O_CREAT | O_EXCL | PG_BINARY); + if (file < 0 && errno == EEXIST && isRedo) + file = PathNameOpenTemporaryFile(versionfile, O_WRONLY | O_TRUNC | PG_BINARY); - if (fd < 0) + if (file < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not create file \"%s\": %m", versionfile))); /* Write PG_MAJORVERSION in the PG_VERSION file. */ - pgstat_report_wait_start(WAIT_EVENT_VERSION_FILE_WRITE); - errno = 0; - if ((int) write(fd, buf, nbytes) != nbytes) - { - /* If write didn't set errno, assume problem is no disk space. */ - if (errno == 0) - errno = ENOSPC; + if (FileWriteSeq(file, buf, nbytes, WAIT_EVENT_VERSION_FILE_WRITE) != nbytes) ereport(ERROR, (errcode_for_file_access(), errmsg("could not write to file \"%s\": %m", versionfile))); - } - pgstat_report_wait_end(); /* Close the version file. */ - CloseTransientFile(fd); + FileClose(file); /* Critical section done. */ if (!isRedo) diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index 0eabe18335..a1220a530b 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -67,6 +67,7 @@ #include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/varlena.h" +#include "utils/wait_event.h" /* Globally visible state variables */ @@ -3435,37 +3436,32 @@ static char * read_whole_file(const char *filename, int *length) { char *buf; - FILE *file; + File file; size_t bytes_to_read; - struct stat fst; - if (stat(filename, &fst) < 0) + file = PathNameOpenTemporaryFile(filename, O_RDONLY); + if (file < 0) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not stat file \"%s\": %m", filename))); + errmsg("could not open file \"%s\" for reading: %m", + filename))); - if (fst.st_size > (MaxAllocSize - 1)) + bytes_to_read = FileSize(file); + if (bytes_to_read > (MaxAllocSize -1)) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("file \"%s\" is too large", filename))); - bytes_to_read = (size_t) fst.st_size; + errmsg("file \"%s\" is too large", filename))); - if ((file = AllocateFile(filename, PG_BINARY_R)) == NULL) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not open file \"%s\" for reading: %m", - filename))); buf = (char *) palloc(bytes_to_read + 1); - *length = fread(buf, 1, bytes_to_read, file); - - if (ferror(file)) + *length = FileReadSeq(file, buf, bytes_to_read, 0); + if (*length != bytes_to_read) ereport(ERROR, (errcode_for_file_access(), errmsg("could not read file \"%s\": %m", filename))); - FreeFile(file); + FileClose(file); buf[*length] = '\0'; return buf; -- 2.33.0 From 5971a3715156613484670aa6ccb6a0f145d2828e Mon Sep 17 00:00:00 2001 From: John Morris Date: Wed, 28 Jun 2023 21:11:22 -0700 Subject: [PATCH 5/6] Replication uses new api --- src/backend/replication/logical/origin.c | 56 ++++------- .../replication/logical/reorderbuffer.c | 94 +++++++------------ src/backend/replication/logical/snapbuild.c | 69 +++++--------- src/backend/replication/slot.c | 47 ++++------ 4 files changed, 93 insertions(+), 173 deletions(-) diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c index b0255ffd25..0f8dd4b134 100644 --- a/src/backend/replication/logical/origin.c +++ b/src/backend/replication/logical/origin.c @@ -574,7 +574,7 @@ CheckPointReplicationOrigin(void) { const char *tmppath = "pg_logical/replorigin_checkpoint.tmp"; const char *path = "pg_logical/replorigin_checkpoint"; - int tmpfd; + File file; int i; uint32 magic = REPLICATION_STATE_MAGIC; pg_crc32c crc; @@ -595,9 +595,9 @@ CheckPointReplicationOrigin(void) * no other backend can perform this at the same time; only one checkpoint * can happen at a time. */ - tmpfd = OpenTransientFile(tmppath, + file = PathNameOpenTemporaryFile(tmppath, O_CREAT | O_EXCL | O_WRONLY | PG_BINARY); - if (tmpfd < 0) + if (file < 0) ereport(PANIC, (errcode_for_file_access(), errmsg("could not create file \"%s\": %m", @@ -605,16 +605,12 @@ CheckPointReplicationOrigin(void) /* write magic */ errno = 0; - if ((write(tmpfd, &magic, sizeof(magic))) != sizeof(magic)) - { - /* if write didn't set errno, assume problem is no disk space */ - if (errno == 0) - errno = ENOSPC; + if ((FileWriteSeq(file, &magic, sizeof(magic), 0)) != sizeof(magic)) ereport(PANIC, (errcode_for_file_access(), errmsg("could not write to file \"%s\": %m", tmppath))); - } + COMP_CRC32C(crc, &magic, sizeof(magic)); /* prevent concurrent creations/drops */ @@ -644,19 +640,13 @@ CheckPointReplicationOrigin(void) /* make sure we only write out a commit that's persistent */ XLogFlush(local_lsn); - - errno = 0; - if ((write(tmpfd, &disk_state, sizeof(disk_state))) != + + if ((FileWriteSeq(file, &disk_state, sizeof(disk_state), 0)) != sizeof(disk_state)) - { - /* if write didn't set errno, assume problem is no disk space */ - if (errno == 0) - errno = ENOSPC; ereport(PANIC, (errcode_for_file_access(), errmsg("could not write to file \"%s\": %m", tmppath))); - } COMP_CRC32C(crc, &disk_state, sizeof(disk_state)); } @@ -665,23 +655,13 @@ CheckPointReplicationOrigin(void) /* write out the CRC */ FIN_CRC32C(crc); - errno = 0; - if ((write(tmpfd, &crc, sizeof(crc))) != sizeof(crc)) - { - /* if write didn't set errno, assume problem is no disk space */ - if (errno == 0) - errno = ENOSPC; + if ((FileWriteSeq(file, &crc, sizeof(crc), 0)) != sizeof(crc)) ereport(PANIC, (errcode_for_file_access(), errmsg("could not write to file \"%s\": %m", tmppath))); - } - if (CloseTransientFile(tmpfd) != 0) - ereport(PANIC, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", - tmppath))); + FileClose(file); /* fsync, rename to permanent file, fsync file and directory */ durable_rename(tmppath, path, PANIC); @@ -699,7 +679,7 @@ void StartupReplicationOrigin(void) { const char *path = "pg_logical/replorigin_checkpoint"; - int fd; + File file; int readBytes; uint32 magic = REPLICATION_STATE_MAGIC; int last_state = 0; @@ -721,22 +701,22 @@ StartupReplicationOrigin(void) elog(DEBUG2, "starting up replication origin progress state"); - fd = OpenTransientFile(path, O_RDONLY | PG_BINARY); + file = PathNameOpenTemporaryFile(path, O_RDONLY | PG_BINARY); /* * might have had max_replication_slots == 0 last run, or we just brought * up a standby. */ - if (fd < 0 && errno == ENOENT) + if (file < 0 && errno == ENOENT) return; - else if (fd < 0) + else if (file < 0) ereport(PANIC, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", path))); /* verify magic, that is written even if nothing was active */ - readBytes = read(fd, &magic, sizeof(magic)); + readBytes = FileReadSeq(file, &magic, sizeof(magic), 0); if (readBytes != sizeof(magic)) { if (readBytes < 0) @@ -764,7 +744,7 @@ StartupReplicationOrigin(void) { ReplicationStateOnDisk disk_state; - readBytes = read(fd, &disk_state, sizeof(disk_state)); + readBytes = FileReadSeq(file, &disk_state, sizeof(disk_state), 0); /* no further data */ if (readBytes == sizeof(crc)) @@ -816,11 +796,7 @@ StartupReplicationOrigin(void) errmsg("replication slot checkpoint has wrong checksum %u, expected %u", crc, file_crc))); - if (CloseTransientFile(fd) != 0) - ereport(PANIC, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", - path))); + FileClose(file); } void diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 26d252bd87..995318534d 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -131,21 +131,13 @@ typedef struct ReorderBufferTupleCidEnt CommandId combocid; /* just for debugging */ } ReorderBufferTupleCidEnt; -/* Virtual file descriptor with file offset tracking */ -typedef struct TXNEntryFile -{ - File vfd; /* -1 when the file is closed */ - off_t curOffset; /* offset for next write or read. Reset to 0 - * when vfd is opened. */ -} TXNEntryFile; - /* k-way in-order change iteration support structures */ typedef struct ReorderBufferIterTXNEntry { XLogRecPtr lsn; ReorderBufferChange *change; ReorderBufferTXN *txn; - TXNEntryFile file; + File file; XLogSegNo segno; } ReorderBufferIterTXNEntry; @@ -249,9 +241,9 @@ static void ReorderBufferExecuteInvalidations(uint32 nmsgs, SharedInvalidationMe static void ReorderBufferCheckMemoryLimit(ReorderBuffer *rb); static void ReorderBufferSerializeTXN(ReorderBuffer *rb, ReorderBufferTXN *txn); static void ReorderBufferSerializeChange(ReorderBuffer *rb, ReorderBufferTXN *txn, - int fd, ReorderBufferChange *change); + int file, ReorderBufferChange *change); static Size ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn, - TXNEntryFile *file, XLogSegNo *segno); + File *fileP, XLogSegNo *segno); static void ReorderBufferRestoreChange(ReorderBuffer *rb, ReorderBufferTXN *txn, char *data); static void ReorderBufferRestoreCleanup(ReorderBuffer *rb, ReorderBufferTXN *txn); @@ -1291,7 +1283,7 @@ ReorderBufferIterTXNInit(ReorderBuffer *rb, ReorderBufferTXN *txn, for (off = 0; off < state->nr_txns; off++) { - state->entries[off].file.vfd = -1; + state->entries[off].file = -1; state->entries[off].segno = 0; } @@ -1473,8 +1465,8 @@ ReorderBufferIterTXNFinish(ReorderBuffer *rb, for (off = 0; off < state->nr_txns; off++) { - if (state->entries[off].file.vfd != -1) - FileClose(state->entries[off].file.vfd); + if (state->entries[off].file != -1) + FileClose(state->entries[off].file); } /* free memory we might have "leaked" in the last *Next call */ @@ -3651,7 +3643,7 @@ ReorderBufferSerializeTXN(ReorderBuffer *rb, ReorderBufferTXN *txn) { dlist_iter subtxn_i; dlist_mutable_iter change_i; - int fd = -1; + File file = -1; XLogSegNo curOpenSegNo = 0; Size spilled = 0; Size size = txn->size; @@ -3679,13 +3671,13 @@ ReorderBufferSerializeTXN(ReorderBuffer *rb, ReorderBufferTXN *txn) * store in segment in which it belongs by start lsn, don't split over * multiple segments tho */ - if (fd == -1 || + if (file == -1 || !XLByteInSeg(change->lsn, curOpenSegNo, wal_segment_size)) { char path[MAXPGPATH]; - if (fd != -1) - CloseTransientFile(fd); + if (file != -1) + FileClose(file); XLByteToSeg(change->lsn, curOpenSegNo, wal_segment_size); @@ -3697,16 +3689,16 @@ ReorderBufferSerializeTXN(ReorderBuffer *rb, ReorderBufferTXN *txn) curOpenSegNo); /* open segment, create it if necessary */ - fd = OpenTransientFile(path, + file = PathNameOpenTemporaryFile(path, O_CREAT | O_WRONLY | O_APPEND | PG_BINARY); - if (fd < 0) + if (file < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", path))); } - ReorderBufferSerializeChange(rb, txn, fd, change); + ReorderBufferSerializeChange(rb, txn, file, change); dlist_delete(&change->node); ReorderBufferReturnChange(rb, change, true); @@ -3731,8 +3723,8 @@ ReorderBufferSerializeTXN(ReorderBuffer *rb, ReorderBufferTXN *txn) txn->nentries_mem = 0; txn->txn_flags |= RBTXN_IS_SERIALIZED; - if (fd != -1) - CloseTransientFile(fd); + if (file != -1) + FileClose(file); } /* @@ -3740,7 +3732,7 @@ ReorderBufferSerializeTXN(ReorderBuffer *rb, ReorderBufferTXN *txn) */ static void ReorderBufferSerializeChange(ReorderBuffer *rb, ReorderBufferTXN *txn, - int fd, ReorderBufferChange *change) + File file, ReorderBufferChange *change) { ReorderBufferDiskChange *ondisk; Size sz = sizeof(ReorderBufferDiskChange); @@ -3922,12 +3914,11 @@ ReorderBufferSerializeChange(ReorderBuffer *rb, ReorderBufferTXN *txn, ondisk->size = sz; errno = 0; - pgstat_report_wait_start(WAIT_EVENT_REORDER_BUFFER_WRITE); - if (write(fd, rb->outbuf, ondisk->size) != ondisk->size) + if (FileWriteSeq(file, rb->outbuf, ondisk->size, WAIT_EVENT_REORDER_BUFFER_WRITE) != ondisk->size) { int save_errno = errno; - CloseTransientFile(fd); + FileClose(file); /* if write didn't set errno, assume problem is no disk space */ errno = save_errno ? save_errno : ENOSPC; @@ -3936,7 +3927,6 @@ ReorderBufferSerializeChange(ReorderBuffer *rb, ReorderBufferTXN *txn, errmsg("could not write to data file for XID %u: %m", txn->xid))); } - pgstat_report_wait_end(); /* * Keep the transaction's final_lsn up to date with each change we send to @@ -4192,12 +4182,11 @@ ReorderBufferChangeSize(ReorderBufferChange *change) */ static Size ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn, - TXNEntryFile *file, XLogSegNo *segno) + File *fileP, XLogSegNo *segno) { Size restored = 0; XLogSegNo last_segno; dlist_mutable_iter cleanup_iter; - File *fd = &file->vfd; Assert(txn->first_lsn != InvalidXLogRecPtr); Assert(txn->final_lsn != InvalidXLogRecPtr); @@ -4223,7 +4212,7 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn, CHECK_FOR_INTERRUPTS(); - if (*fd == -1) + if (*fileP == -1) { char path[MAXPGPATH]; @@ -4240,18 +4229,15 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn, ReorderBufferSerializedPath(path, MyReplicationSlot, txn->xid, *segno); - *fd = PathNameOpenFile(path, O_RDONLY | PG_BINARY); + *fileP = PathNameOpenFile(path, O_RDONLY | PG_BINARY); - /* No harm in resetting the offset even in case of failure */ - file->curOffset = 0; - - if (*fd < 0 && errno == ENOENT) + if (*fileP < 0 && errno == ENOENT) { - *fd = -1; + *fileP = -1; (*segno)++; continue; } - else if (*fd < 0) + else if (*fileP < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", @@ -4264,15 +4250,15 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn, * end of this file. */ ReorderBufferSerializeReserve(rb, sizeof(ReorderBufferDiskChange)); - readBytes = FileRead(file->vfd, rb->outbuf, - sizeof(ReorderBufferDiskChange), - file->curOffset, WAIT_EVENT_REORDER_BUFFER_READ); + readBytes = FileReadSeq(*fileP, rb->outbuf, + sizeof(ReorderBufferDiskChange), + WAIT_EVENT_REORDER_BUFFER_READ); /* eof */ if (readBytes == 0) { - FileClose(*fd); - *fd = -1; + FileClose(*fileP); + *fileP = -1; (*segno)++; continue; } @@ -4287,18 +4273,15 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn, readBytes, (uint32) sizeof(ReorderBufferDiskChange)))); - file->curOffset += readBytes; - ondisk = (ReorderBufferDiskChange *) rb->outbuf; ReorderBufferSerializeReserve(rb, sizeof(ReorderBufferDiskChange) + ondisk->size); ondisk = (ReorderBufferDiskChange *) rb->outbuf; - readBytes = FileRead(file->vfd, + readBytes = FileReadSeq(*fileP, rb->outbuf + sizeof(ReorderBufferDiskChange), ondisk->size - sizeof(ReorderBufferDiskChange), - file->curOffset, WAIT_EVENT_REORDER_BUFFER_READ); if (readBytes < 0) @@ -4312,8 +4295,6 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn, readBytes, (uint32) (ondisk->size - sizeof(ReorderBufferDiskChange))))); - file->curOffset += readBytes; - /* * ok, read a full change from disk, now restore it into proper * in-memory format @@ -5018,13 +4999,13 @@ static void ApplyLogicalMappingFile(HTAB *tuplecid_data, Oid relid, const char *fname) { char path[MAXPGPATH]; - int fd; + File file; int readBytes; LogicalRewriteMappingData map; sprintf(path, "pg_logical/mappings/%s", fname); - fd = OpenTransientFile(path, O_RDONLY | PG_BINARY); - if (fd < 0) + file = PathNameOpenTemporaryFile(path, O_RDONLY | PG_BINARY); + if (file < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", path))); @@ -5040,9 +5021,7 @@ ApplyLogicalMappingFile(HTAB *tuplecid_data, Oid relid, const char *fname) memset(&key, 0, sizeof(ReorderBufferTupleCidKey)); /* read all mappings till the end of the file */ - pgstat_report_wait_start(WAIT_EVENT_REORDER_LOGICAL_MAPPING_READ); - readBytes = read(fd, &map, sizeof(LogicalRewriteMappingData)); - pgstat_report_wait_end(); + readBytes = FileReadSeq(file, &map, sizeof(LogicalRewriteMappingData), WAIT_EVENT_REORDER_LOGICAL_MAPPING_READ); if (readBytes < 0) ereport(ERROR, @@ -5096,10 +5075,7 @@ ApplyLogicalMappingFile(HTAB *tuplecid_data, Oid relid, const char *fname) } } - if (CloseTransientFile(fd) != 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", path))); + FileClose(file); } diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c index 0786bb0ab7..945a80fd4b 100644 --- a/src/backend/replication/logical/snapbuild.c +++ b/src/backend/replication/logical/snapbuild.c @@ -300,7 +300,7 @@ static void SnapBuildWaitSnapshot(xl_running_xacts *running, TransactionId cutof /* serialization functions */ static void SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn); static bool SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn); -static void SnapBuildRestoreContents(int fd, char *dest, Size size, const char *path); +static void SnapBuildRestoreContents(File file, char *dest, Size size, const char *path); /* * Allocate a new snapshot builder. @@ -1606,7 +1606,7 @@ SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn) MemoryContext old_ctx; size_t catchange_xcnt; char *ondisk_c; - int fd; + int file; char tmppath[MAXPGPATH]; char path[MAXPGPATH]; int ret; @@ -1745,23 +1745,16 @@ SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn) FIN_CRC32C(ondisk->checksum); /* we have valid data now, open tempfile and write it there */ - fd = OpenTransientFile(tmppath, + file = PathNameOpenTemporaryFile(tmppath, O_CREAT | O_EXCL | O_WRONLY | PG_BINARY); - if (fd < 0) + if (file < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", tmppath))); - errno = 0; - pgstat_report_wait_start(WAIT_EVENT_SNAPBUILD_WRITE); - if ((write(fd, ondisk, needed_length)) != needed_length) + if ((FileWriteSeq(file, ondisk, needed_length, WAIT_EVENT_SNAPBUILD_WRITE)) != needed_length) { - int save_errno = errno; - - CloseTransientFile(fd); - - /* if write didn't set errno, assume problem is no disk space */ - errno = save_errno ? save_errno : ENOSPC; + FileClose(file); ereport(ERROR, (errcode_for_file_access(), errmsg("could not write to file \"%s\": %m", tmppath))); @@ -1779,24 +1772,20 @@ SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn) * some noticeable overhead since it's performed synchronously during * decoding? */ - pgstat_report_wait_start(WAIT_EVENT_SNAPBUILD_SYNC); - if (pg_fsync(fd) != 0) + if (FileSync(file, WAIT_EVENT_SNAPBUILD_SYNC) != 0) { int save_errno = errno; - - CloseTransientFile(fd); + FileClose(file); errno = save_errno; + ereport(ERROR, (errcode_for_file_access(), errmsg("could not fsync file \"%s\": %m", tmppath))); } - pgstat_report_wait_end(); - if (CloseTransientFile(fd) != 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", tmppath))); + FileClose(file); + /* Sync the directory as well */ fsync_fname("pg_logical/snapshots", true); /* @@ -1841,7 +1830,7 @@ static bool SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn) { SnapBuildOnDisk ondisk; - int fd; + File file; char path[MAXPGPATH]; Size sz; pg_crc32c checksum; @@ -1853,11 +1842,11 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn) sprintf(path, "pg_logical/snapshots/%X-%X.snap", LSN_FORMAT_ARGS(lsn)); - fd = OpenTransientFile(path, O_RDONLY | PG_BINARY); - - if (fd < 0 && errno == ENOENT) + file = PathNameOpenTemporaryFile(path, O_RDONLY | PG_BINARY); + if (file < 0 && errno == ENOENT) return false; - else if (fd < 0) + + else if (file < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", path))); @@ -1875,7 +1864,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn) /* read statically sized portion of snapshot */ - SnapBuildRestoreContents(fd, (char *) &ondisk, SnapBuildOnDiskConstantSize, path); + SnapBuildRestoreContents(file, (char *) &ondisk, SnapBuildOnDiskConstantSize, path); if (ondisk.magic != SNAPBUILD_MAGIC) ereport(ERROR, @@ -1895,7 +1884,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn) SnapBuildOnDiskConstantSize - SnapBuildOnDiskNotChecksummedSize); /* read SnapBuild */ - SnapBuildRestoreContents(fd, (char *) &ondisk.builder, sizeof(SnapBuild), path); + SnapBuildRestoreContents(file, (char *) &ondisk.builder, sizeof(SnapBuild), path); COMP_CRC32C(checksum, &ondisk.builder, sizeof(SnapBuild)); /* restore committed xacts information */ @@ -1903,7 +1892,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn) { sz = sizeof(TransactionId) * ondisk.builder.committed.xcnt; ondisk.builder.committed.xip = MemoryContextAllocZero(builder->context, sz); - SnapBuildRestoreContents(fd, (char *) ondisk.builder.committed.xip, sz, path); + SnapBuildRestoreContents(file, (char *) ondisk.builder.committed.xip, sz, path); COMP_CRC32C(checksum, ondisk.builder.committed.xip, sz); } @@ -1912,14 +1901,11 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn) { sz = sizeof(TransactionId) * ondisk.builder.catchange.xcnt; ondisk.builder.catchange.xip = MemoryContextAllocZero(builder->context, sz); - SnapBuildRestoreContents(fd, (char *) ondisk.builder.catchange.xip, sz, path); + SnapBuildRestoreContents(file, (char *) ondisk.builder.catchange.xip, sz, path); COMP_CRC32C(checksum, ondisk.builder.catchange.xip, sz); } - if (CloseTransientFile(fd) != 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", path))); + FileClose(file); FIN_CRC32C(checksum); @@ -2006,26 +1992,19 @@ snapshot_not_interesting: * Read the contents of the serialized snapshot to 'dest'. */ static void -SnapBuildRestoreContents(int fd, char *dest, Size size, const char *path) +SnapBuildRestoreContents(File file, char *dest, Size size, const char *path) { int readBytes; - pgstat_report_wait_start(WAIT_EVENT_SNAPBUILD_READ); - readBytes = read(fd, dest, size); - pgstat_report_wait_end(); + readBytes = FileReadSeq(file, dest, size, WAIT_EVENT_SNAPBUILD_READ); if (readBytes != size) { - int save_errno = errno; - - CloseTransientFile(fd); + FileClose(file); if (readBytes < 0) - { - errno = save_errno; ereport(ERROR, (errcode_for_file_access(), errmsg("could not read file \"%s\": %m", path))); - } else ereport(ERROR, (errcode(ERRCODE_DATA_CORRUPTED), diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c index 1dc27264f6..209b18dfc3 100644 --- a/src/backend/replication/slot.c +++ b/src/backend/replication/slot.c @@ -1730,7 +1730,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) { char tmppath[MAXPGPATH]; char path[MAXPGPATH]; - int fd; + File file; ReplicationSlotOnDisk cp; bool was_dirty; @@ -1752,8 +1752,8 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) sprintf(tmppath, "%s/state.tmp", dir); sprintf(path, "%s/state", dir); - fd = OpenTransientFile(tmppath, O_CREAT | O_EXCL | O_WRONLY | PG_BINARY); - if (fd < 0) + file = PathNameOpenTemporaryFile(tmppath, O_CREAT | O_EXCL | O_WRONLY | PG_BINARY); + if (file < 0) { /* * If not an ERROR, then release the lock before returning. In case @@ -1789,33 +1789,28 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) FIN_CRC32C(cp.checksum); errno = 0; - pgstat_report_wait_start(WAIT_EVENT_REPLICATION_SLOT_WRITE); - if ((write(fd, &cp, sizeof(cp))) != sizeof(cp)) + if (FileWriteSeq(file, &cp, sizeof(cp), WAIT_EVENT_REPLICATION_SLOT_WRITE) != sizeof(cp)) { int save_errno = errno; - pgstat_report_wait_end(); - CloseTransientFile(fd); + FileClose(file); LWLockRelease(&slot->io_in_progress_lock); /* if write didn't set errno, assume problem is no disk space */ - errno = save_errno ? save_errno : ENOSPC; + errno = save_errno; ereport(elevel, (errcode_for_file_access(), errmsg("could not write to file \"%s\": %m", tmppath))); return; } - pgstat_report_wait_end(); /* fsync the temporary file */ - pgstat_report_wait_start(WAIT_EVENT_REPLICATION_SLOT_SYNC); - if (pg_fsync(fd) != 0) + if (FileSync(file, WAIT_EVENT_REPLICATION_SLOT_SYNC) != 0) { int save_errno = errno; - pgstat_report_wait_end(); - CloseTransientFile(fd); + FileClose(file); LWLockRelease(&slot->io_in_progress_lock); errno = save_errno; ereport(elevel, @@ -1824,9 +1819,8 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) tmppath))); return; } - pgstat_report_wait_end(); - if (CloseTransientFile(fd) != 0) + if (FileClose(file) != 0) { int save_errno = errno; @@ -1886,7 +1880,7 @@ RestoreSlotFromDisk(const char *name) int i; char slotdir[MAXPGPATH + 12]; char path[MAXPGPATH + 22]; - int fd; + File file; bool restored = false; int readBytes; pg_crc32c checksum; @@ -1906,13 +1900,13 @@ RestoreSlotFromDisk(const char *name) elog(DEBUG1, "restoring replication slot from \"%s\"", path); /* on some operating systems fsyncing a file requires O_RDWR */ - fd = OpenTransientFile(path, O_RDWR | PG_BINARY); + file = PathNameOpenTemporaryFile(path, O_RDWR | PG_BINARY); /* * We do not need to handle this as we are rename()ing the directory into * place only after we fsync()ed the state file. */ - if (fd < 0) + if (file < 0) ereport(PANIC, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", path))); @@ -1921,13 +1915,11 @@ RestoreSlotFromDisk(const char *name) * Sync state file before we're reading from it. We might have crashed * while it wasn't synced yet and we shouldn't continue on that basis. */ - pgstat_report_wait_start(WAIT_EVENT_REPLICATION_SLOT_RESTORE_SYNC); - if (pg_fsync(fd) != 0) + if (FileSync(file, WAIT_EVENT_REPLICATION_SLOT_RESTORE_SYNC) != 0) ereport(PANIC, (errcode_for_file_access(), errmsg("could not fsync file \"%s\": %m", path))); - pgstat_report_wait_end(); /* Also sync the parent directory */ START_CRIT_SECTION(); @@ -1935,9 +1927,7 @@ RestoreSlotFromDisk(const char *name) END_CRIT_SECTION(); /* read part of statefile that's guaranteed to be version independent */ - pgstat_report_wait_start(WAIT_EVENT_REPLICATION_SLOT_READ); - readBytes = read(fd, &cp, ReplicationSlotOnDiskConstantSize); - pgstat_report_wait_end(); + readBytes = FileReadSeq(file, &cp, ReplicationSlotOnDiskConstantSize, WAIT_EVENT_REPLICATION_SLOT_READ); if (readBytes != ReplicationSlotOnDiskConstantSize) { if (readBytes < 0) @@ -1974,11 +1964,10 @@ RestoreSlotFromDisk(const char *name) path, cp.length))); /* Now that we know the size, read the entire file */ - pgstat_report_wait_start(WAIT_EVENT_REPLICATION_SLOT_READ); - readBytes = read(fd, + readBytes = FileReadSeq(file, (char *) &cp + ReplicationSlotOnDiskConstantSize, - cp.length); - pgstat_report_wait_end(); + cp.length, + WAIT_EVENT_REPLICATION_SLOT_READ); if (readBytes != cp.length) { if (readBytes < 0) @@ -1992,7 +1981,7 @@ RestoreSlotFromDisk(const char *name) path, readBytes, (Size) cp.length))); } - if (CloseTransientFile(fd) != 0) + if (FileClose(file) != 0) ereport(PANIC, (errcode_for_file_access(), errmsg("could not close file \"%s\": %m", path))); -- 2.33.0 From 0709ea41ff7b4fca95e3e37446123d27a4b7c655 Mon Sep 17 00:00:00 2001 From: John Morris Date: Wed, 28 Jun 2023 21:21:41 -0700 Subject: [PATCH 6/6] utils uses new api --- src/backend/utils/activity/pgstat.c | 102 ++++++++++++-------------- src/backend/utils/cache/relmapper.c | 54 +++++++------- src/backend/utils/resowner/resowner.c | 3 +- 3 files changed, 71 insertions(+), 88 deletions(-) diff --git a/src/backend/utils/activity/pgstat.c b/src/backend/utils/activity/pgstat.c index d743fc0b28..f5759fac1a 100644 --- a/src/backend/utils/activity/pgstat.c +++ b/src/backend/utils/activity/pgstat.c @@ -1288,14 +1288,9 @@ pgstat_assert_is_up(void) /* helpers for pgstat_write_statsfile() */ static void -write_chunk(FILE *fpout, void *ptr, size_t len) +write_chunk(File file, void *ptr, size_t len) { - int rc; - - rc = fwrite(ptr, len, 1, fpout); - - /* we'll check for errors with ferror once at the end */ - (void) rc; + FileWriteSeq(file, ptr, len, 0); } #define write_chunk_s(fpout, ptr) write_chunk(fpout, ptr, sizeof(*ptr)) @@ -1307,7 +1302,7 @@ write_chunk(FILE *fpout, void *ptr, size_t len) static void pgstat_write_statsfile(void) { - FILE *fpout; + File file; int32 format_id; const char *tmpfile = PGSTAT_STAT_PERMANENT_TMPFILE; const char *statfile = PGSTAT_STAT_PERMANENT_FILENAME; @@ -1324,8 +1319,8 @@ pgstat_write_statsfile(void) /* * Open the statistics temp file to write out the current values. */ - fpout = AllocateFile(tmpfile, PG_BINARY_W); - if (fpout == NULL) + file = PathNameOpenTemporaryFile(tmpfile, O_WRONLY | O_CREAT | O_TRUNC | PG_BINARY); + if (file < 0) { ereport(LOG, (errcode_for_file_access(), @@ -1338,7 +1333,7 @@ pgstat_write_statsfile(void) * Write the file header --- currently just a format ID. */ format_id = PGSTAT_FILE_FORMAT_ID; - write_chunk_s(fpout, &format_id); + write_chunk_s(file, &format_id); /* * XXX: The following could now be generalized to just iterate over @@ -1350,37 +1345,37 @@ pgstat_write_statsfile(void) * Write archiver stats struct */ pgstat_build_snapshot_fixed(PGSTAT_KIND_ARCHIVER); - write_chunk_s(fpout, &pgStatLocal.snapshot.archiver); + write_chunk_s(file, &pgStatLocal.snapshot.archiver); /* * Write bgwriter stats struct */ pgstat_build_snapshot_fixed(PGSTAT_KIND_BGWRITER); - write_chunk_s(fpout, &pgStatLocal.snapshot.bgwriter); + write_chunk_s(file, &pgStatLocal.snapshot.bgwriter); /* * Write checkpointer stats struct */ pgstat_build_snapshot_fixed(PGSTAT_KIND_CHECKPOINTER); - write_chunk_s(fpout, &pgStatLocal.snapshot.checkpointer); + write_chunk_s(file, &pgStatLocal.snapshot.checkpointer); /* * Write IO stats struct */ pgstat_build_snapshot_fixed(PGSTAT_KIND_IO); - write_chunk_s(fpout, &pgStatLocal.snapshot.io); + write_chunk_s(file, &pgStatLocal.snapshot.io); /* * Write SLRU stats struct */ pgstat_build_snapshot_fixed(PGSTAT_KIND_SLRU); - write_chunk_s(fpout, &pgStatLocal.snapshot.slru); + write_chunk_s(file, &pgStatLocal.snapshot.slru); /* * Write WAL stats struct */ pgstat_build_snapshot_fixed(PGSTAT_KIND_WAL); - write_chunk_s(fpout, &pgStatLocal.snapshot.wal); + write_chunk_s(file, &pgStatLocal.snapshot.wal); /* * Walk through the stats entries @@ -1408,8 +1403,8 @@ pgstat_write_statsfile(void) if (!kind_info->to_serialized_name) { /* normal stats entry, identified by PgStat_HashKey */ - fputc('S', fpout); - write_chunk_s(fpout, &ps->key); + FilePutc('S', file); + write_chunk_s(file, &ps->key); } else { @@ -1418,13 +1413,13 @@ pgstat_write_statsfile(void) kind_info->to_serialized_name(&ps->key, shstats, &name); - fputc('N', fpout); - write_chunk_s(fpout, &ps->key.kind); - write_chunk_s(fpout, &name); + FilePutc('N', file); + write_chunk_s(file, &ps->key.kind); + write_chunk_s(file, &name); } /* Write except the header part of the entry */ - write_chunk(fpout, + write_chunk(file, pgstat_get_entry_data(ps->key.kind, shstats), pgstat_get_entry_len(ps->key.kind)); } @@ -1435,25 +1430,17 @@ pgstat_write_statsfile(void) * pgstat.stat with it. The ferror() check replaces testing for error * after each individual fputc or fwrite (in write_chunk()) above. */ - fputc('E', fpout); - - if (ferror(fpout)) + FilePutc('E', file); + FileClose(file); + if (FileError(file)) { ereport(LOG, (errcode_for_file_access(), - errmsg("could not write temporary statistics file \"%s\": %m", - tmpfile))); - FreeFile(fpout); - unlink(tmpfile); - } - else if (FreeFile(fpout) < 0) - { - ereport(LOG, - (errcode_for_file_access(), - errmsg("could not close temporary statistics file \"%s\": %m", - tmpfile))); + errmsg("could not write temporary statistics file \"%s\": %m", + tmpfile))); unlink(tmpfile); } + else if (rename(tmpfile, statfile) < 0) { ereport(LOG, @@ -1466,12 +1453,12 @@ pgstat_write_statsfile(void) /* helpers for pgstat_read_statsfile() */ static bool -read_chunk(FILE *fpin, void *ptr, size_t len) +read_chunk(File file, void *ptr, size_t len) { - return fread(ptr, 1, len, fpin) == len; + return FileReadSeq(file, ptr, len, 0) == len; } -#define read_chunk_s(fpin, ptr) read_chunk(fpin, ptr, sizeof(*ptr)) +#define read_chunk_s(file, ptr) read_chunk(file, ptr, sizeof(*ptr)) /* * Reads in existing statistics file into the shared stats hash. @@ -1482,7 +1469,7 @@ read_chunk(FILE *fpin, void *ptr, size_t len) static void pgstat_read_statsfile(void) { - FILE *fpin; + File file; int32 format_id; bool found; const char *statfile = PGSTAT_STAT_PERMANENT_FILENAME; @@ -1502,7 +1489,8 @@ pgstat_read_statsfile(void) * has not yet written the stats file for the first time. Any other * failure condition is suspicious. */ - if ((fpin = AllocateFile(statfile, PG_BINARY_R)) == NULL) + file = PathNameOpenTemporaryFile(statfile, O_RDONLY | PG_BINARY); + if (file < 0) { if (errno != ENOENT) ereport(LOG, @@ -1516,7 +1504,7 @@ pgstat_read_statsfile(void) /* * Verify it's of the expected format. */ - if (!read_chunk_s(fpin, &format_id) || + if (!read_chunk_s(file, &format_id) || format_id != PGSTAT_FILE_FORMAT_ID) goto error; @@ -1529,37 +1517,37 @@ pgstat_read_statsfile(void) /* * Read archiver stats struct */ - if (!read_chunk_s(fpin, &shmem->archiver.stats)) + if (!read_chunk_s(file, &shmem->archiver.stats)) goto error; /* * Read bgwriter stats struct */ - if (!read_chunk_s(fpin, &shmem->bgwriter.stats)) + if (!read_chunk_s(file, &shmem->bgwriter.stats)) goto error; /* * Read checkpointer stats struct */ - if (!read_chunk_s(fpin, &shmem->checkpointer.stats)) + if (!read_chunk_s(file, &shmem->checkpointer.stats)) goto error; /* * Read IO stats struct */ - if (!read_chunk_s(fpin, &shmem->io.stats)) + if (!read_chunk_s(file, &shmem->io.stats)) goto error; /* * Read SLRU stats struct */ - if (!read_chunk_s(fpin, &shmem->slru.stats)) + if (!read_chunk_s(file, &shmem->slru.stats)) goto error; /* * Read WAL stats struct */ - if (!read_chunk_s(fpin, &shmem->wal.stats)) + if (!read_chunk_s(file, &shmem->wal.stats)) goto error; /* @@ -1568,7 +1556,7 @@ pgstat_read_statsfile(void) */ for (;;) { - int t = fgetc(fpin); + int t = FileGetc(file); switch (t) { @@ -1584,7 +1572,7 @@ pgstat_read_statsfile(void) if (t == 'S') { /* normal stats entry, identified by PgStat_HashKey */ - if (!read_chunk_s(fpin, &key)) + if (!read_chunk_s(file, &key)) goto error; if (!pgstat_is_kind_valid(key.kind)) @@ -1597,9 +1585,9 @@ pgstat_read_statsfile(void) PgStat_Kind kind; NameData name; - if (!read_chunk_s(fpin, &kind)) + if (!read_chunk_s(file, &kind)) goto error; - if (!read_chunk_s(fpin, &name)) + if (!read_chunk_s(file, &name)) goto error; if (!pgstat_is_kind_valid(kind)) goto error; @@ -1612,7 +1600,7 @@ pgstat_read_statsfile(void) if (!kind_info->from_serialized_name(&name, &key)) { /* skip over data for entry we don't care about */ - if (fseek(fpin, pgstat_get_entry_len(kind), SEEK_CUR) != 0) + if (FileSeek(file, FileTell(file) + pgstat_get_entry_len(kind)) < 0) goto error; continue; @@ -1640,7 +1628,7 @@ pgstat_read_statsfile(void) header = pgstat_init_entry(key.kind, p); dshash_release_lock(pgStatLocal.shared_hash, p); - if (!read_chunk(fpin, + if (!read_chunk(file, pgstat_get_entry_data(key.kind, header), pgstat_get_entry_len(key.kind))) goto error; @@ -1649,7 +1637,7 @@ pgstat_read_statsfile(void) } case 'E': /* check that 'E' actually signals end of file */ - if (fgetc(fpin) != EOF) + if (FileGetc(file) != EOF) goto error; goto done; @@ -1660,7 +1648,7 @@ pgstat_read_statsfile(void) } done: - FreeFile(fpin); + FileClose(file); elog(DEBUG2, "removing permanent stats file \"%s\"", statfile); unlink(statfile); diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c index 26575cae6c..de81bfa7f3 100644 --- a/src/backend/utils/cache/relmapper.c +++ b/src/backend/utils/cache/relmapper.c @@ -783,7 +783,7 @@ read_relmap_file(RelMapFile *map, char *dbpath, bool lock_held, int elevel) { char mapfilename[MAXPGPATH]; pg_crc32c crc; - int fd; + File file; int r; Assert(elevel >= ERROR); @@ -809,18 +809,21 @@ read_relmap_file(RelMapFile *map, char *dbpath, bool lock_held, int elevel) */ snprintf(mapfilename, sizeof(mapfilename), "%s/%s", dbpath, RELMAPPER_FILENAME); - fd = OpenTransientFile(mapfilename, O_RDONLY | PG_BINARY); - if (fd < 0) + file = PathNameOpenFile(mapfilename, O_RDONLY | PG_BINARY); + if (file < 0) ereport(elevel, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", mapfilename))); /* Now read the data. */ - pgstat_report_wait_start(WAIT_EVENT_RELATION_MAP_READ); - r = read(fd, map, sizeof(RelMapFile)); + r = FileReadSeq(file, map, sizeof(RelMapFile), WAIT_EVENT_RELATION_MAP_READ); if (r != sizeof(RelMapFile)) { + int save_errno = errno; + FileClose(file); + errno = save_errno; + if (r < 0) ereport(elevel, (errcode_for_file_access(), @@ -831,13 +834,8 @@ read_relmap_file(RelMapFile *map, char *dbpath, bool lock_held, int elevel) errmsg("could not read file \"%s\": read %d of %zu", mapfilename, r, sizeof(RelMapFile)))); } - pgstat_report_wait_end(); - if (CloseTransientFile(fd) != 0) - ereport(elevel, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", - mapfilename))); + FileClose(file); if (!lock_held) LWLockRelease(RelationMappingLock); @@ -887,7 +885,7 @@ static void write_relmap_file(RelMapFile *newmap, bool write_wal, bool send_sinval, bool preserve_files, Oid dbid, Oid tsid, const char *dbpath) { - int fd; + File file; char mapfilename[MAXPGPATH]; char maptempfilename[MAXPGPATH]; @@ -912,38 +910,36 @@ write_relmap_file(RelMapFile *newmap, bool write_wal, bool send_sinval, dbpath, RELMAPPER_TEMP_FILENAME); /* - * Open a temporary file. If a file already exists with this name, it must + * Open a virtual file. If a file already exists with this name, it must * be left over from a previous crash, so we can overwrite it. Concurrent * calls to this function are not allowed. */ - fd = OpenTransientFile(maptempfilename, + file = PathNameOpenFile(maptempfilename, O_WRONLY | O_CREAT | O_TRUNC | PG_BINARY); - if (fd < 0) + if (file < 0) ereport(ERROR, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", maptempfilename))); - /* Write new data to the file. */ - pgstat_report_wait_start(WAIT_EVENT_RELATION_MAP_WRITE); - if (write(fd, newmap, sizeof(RelMapFile)) != sizeof(RelMapFile)) + /* + * Write new data to the file. + * We may be invoked during bootstrap, so we do our own cleanup + * rather than depending on the resource owner to close the file. + */ + if (FileWriteSeq(file, newmap, sizeof(RelMapFile), WAIT_EVENT_RELATION_MAP_WRITE) != sizeof(RelMapFile)) { - /* if write didn't set errno, assume problem is no disk space */ - if (errno == 0) - errno = ENOSPC; + int save_errno = errno; + FileClose(file); + errno = save_errno; ereport(ERROR, (errcode_for_file_access(), - errmsg("could not write file \"%s\": %m", - maptempfilename))); + errmsg("could not write file \"%s\": %m", + maptempfilename))); } - pgstat_report_wait_end(); /* And close the file. */ - if (CloseTransientFile(fd) != 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not close file \"%s\": %m", - maptempfilename))); + FileClose(file); if (write_wal) { diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c index f926f1faad..1eb37aecbb 100644 --- a/src/backend/utils/resowner/resowner.c +++ b/src/backend/utils/resowner/resowner.c @@ -33,7 +33,6 @@ #include "utils/resowner_private.h" #include "utils/snapmgr.h" - /* * All resource IDs managed by this code are required to fit into a Datum, * which is fine since they are generally pointers or integers. @@ -714,7 +713,7 @@ ResourceOwnerReleaseInternal(ResourceOwner owner, while (ResourceArrayGetAny(&(owner->filearr), &foundres)) { File res = DatumGetFile(foundres); - + if (isCommit) PrintFileLeakWarning(res); FileClose(res); -- 2.33.0